From f7a6b21f67d6b9fe9a8d675399ad861fc638ff12 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 16:10:36 +0800
Subject: [PATCH] 出入库记录
---
HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlace.ts | 68 +++++++++++-----------
HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx | 3 +
HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordDrawer.tsx | 68 +++++++++++-----------
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs | 11 +++
4 files changed, 81 insertions(+), 69 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs
index 44af241..b1c7ce2 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs
@@ -10,6 +10,7 @@
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
using Volo.Abp.ObjectMapping;
+using CMS.Plugin.HIAWms.Domain.WmsMaterials;
namespace CMS.Plugin.HIAWms.Application.Implements;
@@ -19,14 +20,16 @@
public class WmsInOutStockRecordAppService : CMSPluginAppService, IWmsInOutStockRecordAppService
{
private readonly IWmsInOutStockRecordRepository wmsInOutStockRecordRepository;
+ private readonly IWmsMaterialRepository _wmsMaterialRepository;
/// <summary>
/// Initializes a new instance of the <see cref="WmsInOutStockRecordAppService"/> class.
/// </summary>
/// <param name="WmsInOutStockRecordRepository">The task job repository.</param>
- public WmsInOutStockRecordAppService(IWmsInOutStockRecordRepository _WmsInOutStockRecordRepository)
+ public WmsInOutStockRecordAppService(IWmsInOutStockRecordRepository _WmsInOutStockRecordRepository, IWmsMaterialRepository wmsMaterialRepository)
{
wmsInOutStockRecordRepository = _WmsInOutStockRecordRepository;
+ _wmsMaterialRepository = wmsMaterialRepository;
}
/// <summary>
@@ -104,6 +107,7 @@
//{
// throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialId]);
//}
+ // 鏍￠獙鐗╂枡鏄惁瀛樺湪
var maxSort = await wmsInOutStockRecordRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
@@ -427,7 +431,10 @@
Check.NotNull(input, nameof(input));
Check.NotNullOrWhiteSpace(input.OrderNo, "鍗曟嵁缂栧彿", 50);
Check.NotNullOrWhiteSpace(input.MaterialNo, "鐗╂枡浠跺彿", 50);
- Check.NotNull(input.StockType, "鎿嶄綔绫诲瀷");
+ Check.NotNull(input.ContainerNo, "鎵樼洏鍙�");
+ Check.NotNull(input.SourcePlace, "璧峰搴撲綅");
+ Check.NotNull(input.ToPlace, "鐩爣搴撲綅");
+ Check.NotNull(input.TaskNo, "浠诲姟鍙�");
Check.NotNullOrWhiteSpace(input.MaterialId, "鐗╂枡ID", 50);
Check.NotNullOrWhiteSpace(input.TaskNo, "浠诲姟鍙�", 50);
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordDrawer.tsx b/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordDrawer.tsx
index 4e3daca..c25a205 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordDrawer.tsx
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordDrawer.tsx
@@ -78,12 +78,35 @@
*/
const formItems = reactive([
{
+ label: '浠诲姟鍙�',
+ prop: 'taskNo',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ヤ换鍔″彿',
+ rules: [{ required: true, message: '浠诲姟鍙蜂笉鑳戒负绌�', trigger: 'blur' }],
+ },
+ {
label: '鍗曟嵁缂栧彿',
prop: 'orderNo',
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ崟鎹紪鍙�',
rules: [{ required: true, message: '鍗曟嵁缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
+ },
+ {
+ label: '鎿嶄綔绫诲瀷',
+ prop: 'stockType',
+ el: 'select',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ搷浣滅被鍨�',
+ rules: [{ required: true, message: '鎿嶄綔绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }],
+ },
+ {
+ label: '瀹瑰櫒缂栧彿',
+ prop: 'containerNo',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ鍣ㄧ紪鍙�',
},
{
label: '鐗╂枡鍚嶇О',
@@ -101,19 +124,20 @@
rules: [{ required: true, message: '鐗╂枡浠跺彿涓嶈兘涓虹┖', trigger: 'blur' }],
},
{
- label: '鎿嶄綔绫诲瀷',
- prop: 'stockType',
- el: 'select',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ搷浣滅被鍨�',
- rules: [{ required: true, message: '鎿嶄綔绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }],
- },
- {
- label: '瀹瑰櫒缂栧彿',
- prop: 'containerNo',
+ label: '璧峰搴撲綅',
+ prop: 'sourcePlace',
el: 'input',
//disabled: disabled,
- placeholder: '璇疯緭鍏ュ鍣ㄧ紪鍙�',
+ rules: [{ required: true, message: '璧峰搴撲綅涓嶈兘涓虹┖', trigger: 'blur' }],
+ placeholder: '璇疯緭鍏ヨ捣濮嬪簱浣�',
+ },
+ {
+ label: '鐩爣搴撲綅',
+ prop: 'toPlace',
+ el: 'input',
+ //disabled: disabled,
+ rules: [{ required: true, message: '鐩爣搴撲綅涓嶈兘涓虹┖', trigger: 'blur' }],
+ placeholder: '璇疯緭鍏ョ洰鏍囧簱浣�',
},
{
label: '鏈哄瀷',
@@ -150,28 +174,6 @@
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂橧D',
rules: [{ required: true, message: '鐗╂枡ID涓嶈兘涓虹┖', trigger: 'blur' }],
- },
- {
- label: '浠诲姟鍙�',
- prop: 'taskNo',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ヤ换鍔″彿',
- rules: [{ required: true, message: '浠诲姟鍙蜂笉鑳戒负绌�', trigger: 'blur' }],
- },
- {
- label: '璧峰搴撲綅',
- prop: 'sourcePlace',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ヨ捣濮嬪簱浣�',
- },
- {
- label: '鐩爣搴撲綅',
- prop: 'toPlace',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ョ洰鏍囧簱浣�',
},
])
/**
diff --git a/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlace.ts b/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlace.ts
index 7646423..96efbd1 100644
--- a/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlace.ts
+++ b/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlace.ts
@@ -85,40 +85,40 @@
divided: true,
icon: 'o',
},
- {
- label: '鍚戜笂娣诲姞',
- fn: (c: CurrentType, pageNum: number) => {
- current.value = null
- sort.value = c.index + 1 + (pageNum - 1) * 50
- dialogConfig.visible = true
- dialogConfig.title = '娣诲姞'
- dialogConfig.isAdd = false
- },
- divided: true,
- icon: 'up',
- },
- {
- label: '鍚戜笅娣诲姞',
- fn: (c: CurrentType, pageNum: number) => {
- current.value = null
- sort.value = c.index + 2 + (pageNum - 1) * 50
- dialogConfig.visible = true
- dialogConfig.title = '娣诲姞'
- dialogConfig.isAdd = false
- },
- divided: true,
- icon: 'down',
- },
- {
- label: '鍒涘缓鍓湰',
- fn: async ({ row }: CurrentType) => {
- await wmsPlace.cloneData([row.id])
- ElMessage.success('鍒涘缓鍓湰鎴愬姛')
- tableRef.value?.getList()
- },
- divided: true,
- icon: 'copy',
- },
+ // {
+ // label: '鍚戜笂娣诲姞',
+ // fn: (c: CurrentType, pageNum: number) => {
+ // current.value = null
+ // sort.value = c.index + 1 + (pageNum - 1) * 50
+ // dialogConfig.visible = true
+ // dialogConfig.title = '娣诲姞'
+ // dialogConfig.isAdd = false
+ // },
+ // divided: true,
+ // icon: 'up',
+ // },
+ // {
+ // label: '鍚戜笅娣诲姞',
+ // fn: (c: CurrentType, pageNum: number) => {
+ // current.value = null
+ // sort.value = c.index + 2 + (pageNum - 1) * 50
+ // dialogConfig.visible = true
+ // dialogConfig.title = '娣诲姞'
+ // dialogConfig.isAdd = false
+ // },
+ // divided: true,
+ // icon: 'down',
+ // },
+ // {
+ // label: '鍒涘缓鍓湰',
+ // fn: async ({ row }: CurrentType) => {
+ // await wmsPlace.cloneData([row.id])
+ // ElMessage.success('鍒涘缓鍓湰鎴愬姛')
+ // tableRef.value?.getList()
+ // },
+ // divided: true,
+ // icon: 'copy',
+ // },
{
label: '鍒犻櫎',
fn: async (c: CurrentType) => {
diff --git a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
index 0f6562d..ad5c006 100644
--- a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
+++ b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
@@ -94,6 +94,9 @@
prop: 'sonTaskType',
el: 'select',
//disabled: disabled,
+ rules: [
+ { required: true, message: '瀛愪换鍔＄被鍨嬩笉鑳戒负绌�', trigger: 'blur' },
+ ],
placeholder: '璇疯緭鍏ュ瓙浠诲姟绫诲瀷',
},
{
--
Gitblit v1.9.3