From 3b99d55ef95803ca5b601acc202b4b2baa9ec622 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 14 5月 2025 11:21:59 +0800
Subject: [PATCH] 库位管理修改
---
HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx | 11 +++++++++++
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs | 1 +
HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts | 5 +++++
HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx | 18 ++++++++++++++++++
HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx | 6 +++---
5 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
index 9e583a7..6fab32f 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
@@ -350,7 +350,7 @@
<div class={styles.headerContent}>
<div class={styles.header}>
<IconButton
- v-permission="wmsMaterialStockDetail-add"
+ v-permission="wmsMaterialStock-add"
icon="add-p"
onClick={onAddWmsMaterialStock}
type="primary"
@@ -374,7 +374,7 @@
</el-upload> */}
<IconButton
- v-permission="wmsMaterialStockDetail-output"
+ v-permission="wmsMaterialStock-output"
icon="out"
onClick={handleExport}
>
@@ -408,7 +408,7 @@
閲嶇疆
</IconButton> */}
<IconButton
- v-permission="wmsMaterialStock-add"
+ v-permission="wmsMaterialStockDetail-hightQuery"
icon="search"
onClick={onAdvancedQuery}
type="primary"
diff --git a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx
index c3b230a..75bdf96 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx
@@ -18,6 +18,7 @@
getAreaAreaDataList,
getWmsEnumData,
} from '@/widgets/HIAWms/Models/Service/WmsMaterialDrawer'
+import { lang } from '@/libs/Language/Language'
export const useWmsPlaceDrawer = (props: any, ctx?: any) => {
const wmsPlaceDrawer = injectModel<WmsPlaceDrawer>('wmsPlaceDrawer')
@@ -137,6 +138,19 @@
],
},
{
+ label: '鏄惁绂佺敤',
+ prop: 'isDisabled',
+ el: 'select',
+ options: [
+ { label: '鏄�', value: true },
+ { label: '鍚�', value: false },
+ ],
+ placeholder: '璇烽�夋嫨鏄惁绂佺敤',
+ rules: [
+ { required: true, message: '鏄惁绂佺敤涓嶈兘涓虹┖', trigger: 'change' },
+ ],
+ },
+ {
label: '鏈�澶у簱瀛樻暟',
prop: 'maxStockNumber',
el: (props: any, { attrs }: SetupContext) => {
@@ -203,11 +217,13 @@
emptyContainer: formData.value.emptyContainer, // 鏄惁绌烘墭
maxStockNumber: formData.value.maxStockNumber, // 鏈�澶у簱瀛樻暟
remark: formData.value.remark, // 澶囨敞
+ isDisabled: formData.value.isDisabled, // 鏄惁绂佺敤
}
if (!current.value) {
await wmsPlaceDrawer.addWmsPlace(data)
} else {
const id = current.value.id
+ console.log(data, 'data')
await wmsPlaceDrawer.updateWmsPlace(id, data)
}
ElMessage.success('淇濆瓨鎴愬姛')
@@ -279,6 +295,7 @@
emptyContainer: res.emptyContainer, // 鏄惁绌烘墭
remark: res.remark, // 澶囨敞
maxStockNumber: res.maxStockNumber, // 鏈�澶у簱瀛樻暟
+ isDisabled: res.isDisabled, // 鏄惁绂佺敤
id: res.id, // 涓婚敭ID
}
updateCheckData()
@@ -290,6 +307,7 @@
aisle: 1, // 宸烽亾
layerNo: 1, // 灞�
islock: 0, // 鏄惁閿佸畾
+ isDisabled: false, // 鏄惁绂佺敤
emptyContainer: 0, // 鏄惁绌烘墭
}
updateCheckData()
diff --git a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts
index 1a331aa..c76c741 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts
+++ b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts
@@ -50,6 +50,11 @@
field: 'emptyContainerDesc',
title: '鏄惁绌烘墭',
},
+
+ {
+ field: 'isDisabled',
+ title: '鏄惁绂佺敤',
+ },
{
field: 'remark',
title: '澶囨敞',
diff --git a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx
index ddd7982..1a09758 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx
@@ -205,6 +205,17 @@
isHidePagination={isHidePagination}
pageSize={50}
v-slots={{
+ isDisabled: ({ row }: any) => {
+ return (
+ <div>
+ {row.isDisabled != null
+ ? row.isDisabled
+ ? '鏄�'
+ : '鍚�'
+ : '-'}
+ </div>
+ )
+ },
name: ({ row }: any) => {
return row?.name ? (
<TdButton
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
index 2615a9d..5a41555 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
@@ -104,6 +104,7 @@
wmsplace.RedundantField2 = input.RedundantField2;
wmsplace.RedundantField3 = input.RedundantField3;
wmsplace.Remark = input.Remark;
+ wmsplace.IsDisabled = input.IsDisabled;
await _wmsplaceRepository.UpdateAsync(wmsplace);
--
Gitblit v1.9.3