From ed9b0c0b150e295e9a5db053882019a3a64ec299 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 19:02:49 +0800
Subject: [PATCH] 库位页面修改
---
DBScript/02_DML/01_InitData.sql | 22 +++++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs | 2 -
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/CommonHelper/SerialSN/EnumSerialType.cs | 7 +++
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue | 10 ++--
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue | 8 ++++
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue | 4 +-
DBScript/01_DDL/04_DDL_INDEX.sql | 6 ++
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue | 8 ++--
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs | 33 +++++++++++++++-
9 files changed, 84 insertions(+), 16 deletions(-)
diff --git a/DBScript/01_DDL/04_DDL_INDEX.sql b/DBScript/01_DDL/04_DDL_INDEX.sql
index 6438f2e..1d462cd 100644
--- a/DBScript/01_DDL/04_DDL_INDEX.sql
+++ b/DBScript/01_DDL/04_DDL_INDEX.sql
@@ -6,4 +6,8 @@
-- 客户编号创建一个新的唯一索引 update liuwq 2024-04-25
CREATE UNIQUE INDEX idx_base_customer_custCode
-ON base_customer (CustCode);
\ No newline at end of file
+ON base_customer (CustCode);
+
+-- 库位编号创建一个新的唯一索引 update liuwq 2024-04-25
+CREATE UNIQUE INDEX idx_wms_place_placeCode
+ON wms_place (PlaceCode);
\ No newline at end of file
diff --git a/DBScript/02_DML/01_InitData.sql b/DBScript/02_DML/01_InitData.sql
index 6e36df0..a1a8cf6 100644
--- a/DBScript/02_DML/01_InitData.sql
+++ b/DBScript/02_DML/01_InitData.sql
@@ -63,3 +63,25 @@
(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
VALUES(34, N'1', 30, 5, N'SN', 3, 0, 1, NULL, 0, N'瀹㈡埛缂栧彿-娴佹按鍙�', NULL, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+
+
+-- 鍒濆鍖� 搴撲綅缂栧彿 銆怑ditby liuwq,2024-04-25銆�
+ DELETE Base_SerialRuleDetail where SerialType =40;
+ GO
+
+ INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(40, N'1', 40, 1, N'UD', 15, 0, 1, N'BC_', 0, N'瀹㈡埛缂栧彿-鍓嶇紑', NULL, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(41, N'1', 40, 2, N'Y4', 4, 0, 1, NULL, 0, N'瀹㈡埛缂栧彿-骞翠唤', NULL, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(42, N'1', 40, 3, N'M2', 4, 0, 1, NULL, 0, N'瀹㈡埛缂栧彿-鏈堜唤', NULL, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(43, N'1', 40, 4, N'D2', 4, 0, 1, NULL, 0, N'瀹㈡埛缂栧彿-鏃�', NULL, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(44, N'1', 40, 5, N'SN', 3, 0, 1, NULL, 0, N'瀹㈡埛缂栧彿-娴佹按鍙�', NULL, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
index b1ed5b1..d57ceb1 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
@@ -3,10 +3,10 @@
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
- <a-form-item label="搴撲綅缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-form-item label="搴撲綅缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ簱浣嶇紪鐮�"
v-decorator="['placeCode', { rules: [{ required: true, message: '璇疯緭鍏ュ簱浣嶇紪鐮侊紒' }] }]" />
- </a-form-item>
+ </a-form-item> -->
<a-form-item label="搴撲綅鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ簱浣嶅悕绉�"
v-decorator="['placeName', { rules: [{ required: true, message: '璇疯緭鍏ュ簱浣嶅悕绉帮紒' }] }]" />
@@ -31,7 +31,7 @@
}}</a-select-option>
</a-select>
</a-form-item>
- <a-form-item label="鏄惁鍫嗗灈鏈哄簱浣�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-form-item label="鏄惁鍫嗗灈鏈哄簱浣�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-switch v-decorator="['isSrmPlace', { valuePropName: 'checked' }]" />
</a-form-item>
<a-form-item label="鍫嗗灈鏈哄簱浣嶅彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
@@ -54,7 +54,7 @@
</a-form-item>
<a-form-item label="杈撻�佺嚎搴撲綅鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ヨ緭閫佺嚎搴撲綅鍙�" v-decorator="['transPlaceNo']" />
- </a-form-item>
+ </a-form-item> -->
<a-form-item label="鏄惁婵�娲讳笌浠诲姟璋冨害" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-switch v-decorator="['isActivateWCS', { valuePropName: 'checked' }]" />
</a-form-item>
@@ -67,7 +67,7 @@
<a-form-item label="鎵�鍦ㄥ簱鍖�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�鍦ㄥ簱鍖�"
v-decorator="['areaid', { rules: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ簱鍖猴紒' }] }]">
- <a-select-option v-for="(item, index) in WmsAreaData" :key="index" :value="item.areaCode">{{ item.areaName
+ <a-select-option v-for="(item, index) in WmsAreaData" :key="index" :value="item.id">{{ item.areaName
}}</a-select-option>
</a-select>
<!-- <a-input placeholder="璇疯緭鍏ユ墍鍦ㄥ簱鍖�" v-decorator="['areaId', {rules: [{required: true, message: '璇疯緭鍏ユ墍鍦ㄥ簱鍖猴紒'}]}]" /> -->
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
index 79ab521..33bad2f 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
@@ -30,7 +30,7 @@
<a-select-option v-for="(item,index) in placeStatusData" :key="index" :value="Number(item.code)">{{ item.name }}</a-select-option>
</a-select>
</a-form-item>
- <a-form-item label="鏄惁鍫嗗灈鏈哄簱浣�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-form-item label="鏄惁鍫嗗灈鏈哄簱浣�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-switch v-decorator="['isSrmPlace', { valuePropName: 'checked' }]" />
</a-form-item>
<a-form-item label="鍫嗗灈鏈哄簱浣嶅彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
@@ -53,7 +53,7 @@
</a-form-item>
<a-form-item label="杈撻�佺嚎搴撲綅鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ヨ緭閫佺嚎搴撲綅鍙�" v-decorator="['transPlaceNo']" />
- </a-form-item>
+ </a-form-item> -->
<a-form-item label="鏄惁婵�娲讳笌浠诲姟璋冨害" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-switch v-decorator="['isActivateWCS', { valuePropName: 'checked' }]" />
</a-form-item>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
index fe082b6..1efb1f8 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
@@ -27,10 +27,10 @@
</a-select>
</a-form-item>
</a-col>
- <a-col :md="8" :sm="24">
+ <!-- <a-col :md="8" :sm="24">
<a-form-item label="搴撲綅绫诲瀷鍚嶇О">
<a-input v-model="queryParam.placeTypeName" allow-clear placeholder="璇疯緭鍏ュ簱浣嶇被鍨嬪悕绉�"/>
- </a-form-item>
+ </a-form-item> -->
</a-col><a-col :md="8" :sm="24">
<a-form-item label="搴撲綅灞炴��">
<a-select :allowClear="true" style="width: 100%" v-model="queryParam.placeStatus" placeholder="璇烽�夋嫨搴撲綅灞炴��">
@@ -38,7 +38,7 @@
</a-select>
</a-form-item>
</a-col>
- <a-col :md="8" :sm="24">
+ <!-- <a-col :md="8" :sm="24">
<a-form-item label="鏄惁鍫嗗灈鏈哄簱浣�">
<a-select :allowClear="true" style="width: 100%" v-model="queryParam.isSrmPlace" placeholder="璇烽�夋嫨鏄惁鍫嗗灈鏈哄簱浣�">
<a-select-option v-for="(item,index) in isSrmPlaceData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
@@ -89,7 +89,7 @@
<a-form-item label="杈撻�佺嚎搴撲綅鍙�">
<a-input v-model="queryParam.transPlaceNo" allow-clear placeholder="璇疯緭鍏ヨ緭閫佺嚎搴撲綅鍙�"/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :md="8" :sm="24">
<a-form-item label="鏄惁婵�娲讳笌浠诲姟璋冨害">
<a-select :allowClear="true" style="width: 100%" v-model="queryParam.isActivateWCS" placeholder="璇烽�夋嫨鏄惁婵�娲讳笌浠诲姟璋冨害">
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue
index ce4ea2c..6acf8f8 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue
@@ -87,7 +87,15 @@
add(record) {
this.visible = true
this.$nextTick(() => {
+ this.form.setFieldsValue(
+ {
+ length: 0,
+ width: 0,
+ height:0,
+
+ }
+ )
});
},
/**
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/CommonHelper/SerialSN/EnumSerialType.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/CommonHelper/SerialSN/EnumSerialType.cs
index e960468..ab86189 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/CommonHelper/SerialSN/EnumSerialType.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/CommonHelper/SerialSN/EnumSerialType.cs
@@ -26,6 +26,13 @@
[Description("瀹㈡埛缂栧彿")]
瀹㈡埛缂栧彿 = 30,
+ /// <summary>
+ /// 搴撲綅缂栧彿
+ /// </summary>
+ [Description("搴撲綅缂栧彿")]
+ 搴撲綅缂栧彿 = 40,
+
+
}
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs
index 4176170..71d8155 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs
@@ -351,7 +351,6 @@
/// <summary>
/// 搴撲綅缂栫爜
/// </summary>
- [Required(ErrorMessage = "搴撲綅缂栫爜涓嶈兘涓虹┖")]
public virtual string PlaceCode { get; set; }
/// <summary>
@@ -374,7 +373,6 @@
/// <summary>
/// 搴撲綅绫诲瀷鍚嶇О
/// </summary>
- [Required(ErrorMessage = "搴撲綅绫诲瀷鍚嶇О涓嶈兘涓虹┖")]
public virtual string PlaceTypeName { get; set; }
/// <summary>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs
index ea3153d..5ff149b 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs
@@ -27,18 +27,20 @@
private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
private readonly ISysExcelTemplateService _sysExcelTemplateService;
private readonly static object _lock = new();
-
+ private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
public WmsPlaceService(
IRepository<WmsPlace,MasterDbContextLocator> wmsPlaceRep
,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
,ISysExcelTemplateService sysExcelTemplateService
+ , IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep
)
{
_wmsPlaceRep = wmsPlaceRep;
_sysDictTypeRep = sysDictTypeRep;
_sysDictDataRep = sysDictDataRep;
_sysExcelTemplateService = sysExcelTemplateService;
+ _wmsAreaRep = wmsAreaRep;
}
/// <summary>
@@ -197,7 +199,21 @@
public async Task Add(AddWmsPlaceInput input)
{
var wmsPlace = input.Adapt<WmsPlace>();
- //楠岃瘉
+ wmsPlace.PlaceCode =await SerialUtil.GetSerial(EnumSerialType.搴撲綅缂栧彿);
+
+ var area = (await _wmsAreaRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.AreaId&&u.IsDeleted==false)).Adapt<WmsAreaOutput>();
+ if (area == null)
+ {
+ throw Oops.Oh($"搴撳尯涓嶅瓨鍦�");
+ }
+ if (area.IsDisabled==true)
+ {
+ throw Oops.Oh($"搴撳尯宸茬鐢�");
+ }
+ wmsPlace.AreaName= area.AreaName;
+ wmsPlace.AreaCode= area.AreaCode;
+ wmsPlace.PlaceTypeName = wmsPlace.PlaceType.ToString();
+ //楠岃瘉
await CheckExisit(wmsPlace);
wmsPlace.CreatedUserId = wmsPlace.UpdatedUserId = SysHelper.GetUserId();
@@ -231,6 +247,19 @@
if (!isExist) throw Oops.Oh(ErrorCode.D1002);
var wmsPlace = input.Adapt<WmsPlace>();
+
+ var area = (await _wmsAreaRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.AreaId && u.IsDeleted == false)).Adapt<WmsAreaOutput>();
+ if (area == null)
+ {
+ throw Oops.Oh($"搴撳尯涓嶅瓨鍦�");
+ }
+ if (area.IsDisabled == true)
+ {
+ throw Oops.Oh($"搴撳尯宸茬鐢�");
+ }
+ wmsPlace.AreaName = area.AreaName;
+ wmsPlace.AreaCode = area.AreaCode;
+ wmsPlace.PlaceTypeName = wmsPlace.PlaceType.ToString();
//楠岃瘉
await CheckExisit(wmsPlace,true);
--
Gitblit v1.9.3