From 9518ee94bf232c771edd97e2c6a00ba5d7f18242 Mon Sep 17 00:00:00 2001
From: 朱桂飞 <zhuguifei@zhuguifeideMacBook-Air.local>
Date: 星期五, 14 二月 2025 12:48:38 +0800
Subject: [PATCH] 修复盘点明细已盘未盘计数bug
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsEquBo.java | 2
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsInventoryDetailController.java | 13 ++++++
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquImportVo.java | 2
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquVo.java | 2
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/EimsEqu.java | 2
eims-ui/apps/web-antd/src/views/eims/inventory-detail/index.vue | 48 +++++++++---------------
eims-ui/apps/web-antd/src/views/eims/inventory-detail/data.tsx | 2
eims/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java | 5 ++
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java | 3 +
9 files changed, 44 insertions(+), 35 deletions(-)
diff --git a/eims-ui/apps/web-antd/src/views/eims/inventory-detail/data.tsx b/eims-ui/apps/web-antd/src/views/eims/inventory-detail/data.tsx
index 13b8bc8..d9e1dc4 100644
--- a/eims-ui/apps/web-antd/src/views/eims/inventory-detail/data.tsx
+++ b/eims-ui/apps/web-antd/src/views/eims/inventory-detail/data.tsx
@@ -55,7 +55,7 @@
fixed: 'left',
slots: {
default: ({ row }) => {
- return renderDict(row.status, DictEnum.EIMS_INVENTORY_DETAIL_STATU);
+ return row.status === null || row.status === '' ? '' : renderDict(row.status, DictEnum.EIMS_INVENTORY_DETAIL_STATU);
}
}
},
diff --git a/eims-ui/apps/web-antd/src/views/eims/inventory-detail/index.vue b/eims-ui/apps/web-antd/src/views/eims/inventory-detail/index.vue
index d8fdaae..6e35041 100644
--- a/eims-ui/apps/web-antd/src/views/eims/inventory-detail/index.vue
+++ b/eims-ui/apps/web-antd/src/views/eims/inventory-detail/index.vue
@@ -29,7 +29,7 @@
// 鏈洏鐐�
const noCheck = ref<string>('鏈洏');
// 鏌ヨ娣诲姞鐩樼偣鏍囪杩囨护
-const checkFilter = ref<string>();
+const checkFilter = ref<string>('');
const formOptions: VbenFormProps = {
commonConfig: {
@@ -42,7 +42,7 @@
wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
handleReset: async () => {
selectTypeId.value = [];
- checkFilter.value = undefined;
+ checkFilter.value = '';
// eslint-disable-next-line no-use-before-define
const { formApi, reload } = tableApi;
await formApi.resetForm();
@@ -102,15 +102,15 @@
const data0 = data.filter((item) => {
return item.status === '' || item.status === null || item.status === '0';
});
- if (data0 !== null && data0.length > 0) {
- noCheck.value = `鏈洏(${data0.length})`;
+ // 涓嶇偣鍑诲凡鐩樺拰鏈洏鏃舵墠鏇存柊宸茬洏鍜屾湭鐩樼殑缁熻鏁版嵁
+ if (checkFilter.value === '') {
+ noCheck.value = data0 !== null && data0.length > 0 ? `鏈洏(${data0.length})` : `鏈洏(0)`;
+ const data1 = data.filter((item) => {
+ return item.status !== '' && item.status !== null && item.status === '1';
+ });
+ check.value = data1 !== null && data1.length > 0 ? `宸茬洏(${data1.length})` : `宸茬洏(0)`;
}
- const data1 = data.filter((item) => {
- return item.status !== '' && item.status !== null && item.status === '1';
- });
- if (data1 !== null && data1.length > 0) {
- check.value = `宸茬洏(${data1.length})`;
- }
+
});
}
}
@@ -163,25 +163,18 @@
}
});
}
+
function handleDownloadExcel() {
commonDownloadExcel(inventoryDetailExport, '鐩樼偣鏄庣粏', tableApi.formApi.form.values, {
fieldMappingTime: formOptions.fieldMappingTime
});
}
-function getImportStatus(row: any) {
- const importStatus = row.importStatus === null || row.importStatus;
- return importStatus ? '鏈鍏�' : '宸插鍏�';
-}
-
-function getInventoryFlag(row: any) {
- const inventoryFlag = row.inventoryFlag === null || row.inventoryFlag;
- return inventoryFlag ? '鏈洏鐐�' : '宸茬洏鐐�';
-}
function handleQuery(isChecked: string) {
checkFilter.value = isChecked;
tableApi.query();
}
+
const { hasAccessByRoles } = useAccess();
const isSuperAdmin = computed(() => hasAccessByRoles(['superadmin']));
</script>
@@ -189,7 +182,8 @@
<template>
<Page :auto-content-height="true">
<div class="flex h-full gap-[8px]">
- <EquTypeTree v-model:select-dept-id="selectTypeId" class="w-[260px]" @reload="() => tableApi.reload()" @select="() => tableApi.reload()" />
+ <EquTypeTree v-model:select-dept-id="selectTypeId" class="w-[260px]" @reload="() => tableApi.reload()"
+ @select="() => tableApi.reload()" />
<BasicTable class="flex-1 overflow-hidden" table-title="鐩樼偣鏄庣粏鍒楄〃">
<template #toolbar-tools>
<Space>
@@ -212,23 +206,17 @@
<template #action="{ row }">
<Space>
- <ghost-button :disabled="!isSuperAdmin" v-access:code="['eims:inventory:edit']" @click.stop="handleEdit(row)">
+ <ghost-button :disabled="!isSuperAdmin" v-access:code="['eims:inventory:edit']"
+ @click.stop="handleEdit(row)">
{{ $t('pages.common.edit') }}
</ghost-button>
- <Popconfirm :get-popup-container="getVxePopupContainer" placement="left" title="纭鍒犻櫎锛�" @confirm="handleDelete(row)">
+ <Popconfirm :get-popup-container="getVxePopupContainer" placement="left" title="纭鍒犻櫎锛�"
+ @confirm="handleDelete(row)">
<ghost-button :disabled="!isSuperAdmin" danger v-access:code="['eims:inventory:remove']" @click.stop="">
{{ $t('pages.common.delete') }}
</ghost-button>
</Popconfirm>
</Space>
- </template>
-
- <template #importStatus="{ row }">
- <span>{{ getImportStatus(row) }}</span>
- </template>
-
- <template #inventoryFlag="{ row }">
- <span>{{ getInventoryFlag(row) }}</span>
</template>
</BasicTable>
</div>
diff --git a/eims/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java b/eims/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java
index b53c10d..e40c5f1 100644
--- a/eims/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java
+++ b/eims/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java
@@ -43,4 +43,9 @@
*/
String EIMS_EQU_UNIT = "eims_equ_unit";
+ /**
+ * 璁惧瀵煎叆鐘舵��
+ */
+ String EIMS_IMPORT_STATUS = "equ_import_status";
+
}
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsInventoryDetailController.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsInventoryDetailController.java
index 611d31f..088cf34 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsInventoryDetailController.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsInventoryDetailController.java
@@ -6,6 +6,10 @@
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.eims.domain.bo.EimsEquBo;
+import org.dromara.eims.domain.vo.EimsEquVo;
+import org.dromara.eims.service.IEimsEquService;
+import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -35,6 +39,7 @@
public class EimsInventoryDetailController extends BaseController {
private final IEimsInventoryDetailService eimsInventoryDetailService;
+ private final IEimsEquService equService;
/**
* 鏌ヨ鐩樼偣鏄庣粏鍒楄〃
@@ -88,6 +93,14 @@
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody EimsInventoryDetailBo bo) {
+ //TODO 楠岃瘉-棣栨鐩樼偣锛岄渶瑕佷慨鏀硅澶囧鍏ョ姸鎬� 鏂板鍏�->宸茬‘璁�
+ if(bo.getStatus().equals("1")){ //宸茬洏
+ EimsEquVo eimsEquVo = equService.queryById(bo.getEquId());
+ EimsEquBo eimsEquBo = new EimsEquBo();
+ eimsEquVo.setImportStatus("1"); // 璁剧疆涓� 宸茬‘璁�
+ BeanUtils.copyProperties(eimsEquVo,eimsEquBo);
+ equService.updateByBo(eimsEquBo);
+ }
return toAjax(eimsInventoryDetailService.updateByBo(bo));
}
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/EimsEqu.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/EimsEqu.java
index fc54040..9a4552a 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/EimsEqu.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/EimsEqu.java
@@ -171,7 +171,7 @@
/**
* 闄勪欢
*/
- private String attachments;
+ private Long attachId;
/**
* 璧勬枡
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsEquBo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsEquBo.java
index 1bb5192..01abb59 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsEquBo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsEquBo.java
@@ -171,7 +171,7 @@
* 闄勪欢
*/
@ExcelProperty(value = "闄勪欢")
- private String attachments;
+ private Long attachId;
/**
* 璧勬枡
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquImportVo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquImportVo.java
index 753a07d..bb43e80 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquImportVo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquImportVo.java
@@ -130,7 +130,7 @@
* 闄勪欢
*/
@ExcelProperty(value = "闄勪欢")
- private String attachments;
+ private Long attachId;
/**
* 璧勬枡
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquVo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquVo.java
index 36a3d0a..9df4c1a 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquVo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquVo.java
@@ -147,7 +147,7 @@
* 闄勪欢
*/
@ExcelProperty(value = "闄勪欢")
- private String attachments;
+ private Long attachId;
/**
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java
index 2d62524..dbd984e 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java
@@ -92,6 +92,9 @@
EimsEquBo equ = BeanUtil.toBean(equVo, EimsEquBo.class);
// TODO 鏍￠獙
//ValidatorUtils.validate(equ);
+
+ //娣诲姞瀛楁榛樿灞炴��
+ equ.setImportStatus(dictService.getDictValue(CacheConstants.EIMS_IMPORT_STATUS,"鏂板鍏�"));
equ.setCreateBy(operUserId);
equService.insertByBo(equ);
successNum++;
--
Gitblit v1.9.3