From f4d2c032c91e459ee8775ba88870478be3e76261 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周三, 24 4月 2024 14:39:09 +0800
Subject: [PATCH] 调整
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs | 4 +
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsMaterialImport.xlsx | 0
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue | 21 ++++--
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs | 6 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue | 22 ++++--
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs | 2
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue | 71 +++++++++--------------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs | 2
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsMaterialEnum.cs | 24 ++++++++
9 files changed, 88 insertions(+), 64 deletions(-)
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 d451407..126b187 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
@@ -17,17 +17,18 @@
<a-form-item label="搴撲綅鍒悕" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ簱浣嶅埆鍚�" v-decorator="['placeAlias']" />
</a-form-item>
- <a-form-item label="搴撲綅绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣嶇被鍨�" style="width: 100%" v-decorator="['placeType', {rules: [{required: true, message: '璇疯緭鍏ュ簱浣嶇被鍨嬶紒'}]}]" />
+ <a-form-item label="搴撲綅绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撲綅绫诲瀷" v-decorator="['placeType', {rules: [{ required: true, message: '璇烽�夋嫨搴撲綅绫诲瀷锛�' }]}]">
+ <a-select-option v-for="(item,index) in placeTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
</a-form-item>
<a-form-item label="搴撲綅绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ簱浣嶇被鍨嬪悕绉�" v-decorator="['placeTypeName']" />
</a-form-item>
- <a-form-item label="瀛樻斁鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ瓨鏀惧崟浣�" v-decorator="['stockUnit']" />
- </a-form-item>
- <a-form-item label="搴撲綅灞炴��" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣嶅睘鎬�" style="width: 100%" v-decorator="['placeStatus']" />
+ <a-form-item label="搴撲綅灞炴��" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撲綅灞炴��" v-decorator="['placeStatus', {rules: [{ required: true, message: '璇烽�夋嫨搴撲綅灞炴�э紒' }]}]">
+ <a-select-option v-for="(item,index) in placeStatusData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
</a-form-item>
<a-form-item label="鏄惁鍫嗗灈鏈哄簱浣�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-switch v-decorator="['isSrmPlace', { valuePropName: 'checked' }]" />
@@ -137,6 +138,8 @@
xs: { span: 24 },
sm: { span: 15 }
},
+ placeTypeData: [],
+ placeStatusData: [],
visible: false,
confirmLoading: false,
form: this.$form.createForm(this)
@@ -150,6 +153,10 @@
this.$nextTick(() => {
});
+ const placeTypeOption = this.$options
+ this.placeTypeData = placeTypeOption.filters['dictData']('place_type')
+ const placeStatusOption = this.$options
+ this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
},
/**
* 鎻愪氦琛ㄥ崟
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 f66833a..c9c6ebb 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
@@ -17,17 +17,18 @@
<a-form-item label="搴撲綅鍒悕" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ簱浣嶅埆鍚�" v-decorator="['placeAlias']" />
</a-form-item>
- <a-form-item label="搴撲綅绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣嶇被鍨�" style="width: 100%" v-decorator="['placeType', {rules: [{required: true, message: '璇疯緭鍏ュ簱浣嶇被鍨嬶紒'}]}]" />
+ <a-form-item label="搴撲綅绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撲綅绫诲瀷" v-decorator="['placeType', {rules: [{ required: true, message: '璇烽�夋嫨搴撲綅绫诲瀷锛�' }]}]">
+ <a-select-option v-for="(item,index) in placeTypeData" :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-input placeholder="璇疯緭鍏ュ簱浣嶇被鍨嬪悕绉�" v-decorator="['placeTypeName']" />
</a-form-item>
- <a-form-item label="瀛樻斁鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ瓨鏀惧崟浣�" v-decorator="['stockUnit']" />
- </a-form-item>
- <a-form-item label="搴撲綅灞炴��" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣嶅睘鎬�" style="width: 100%" v-decorator="['placeStatus']" />
+ <a-form-item label="搴撲綅灞炴��" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撲綅灞炴��" v-decorator="['placeStatus', {rules: [{ required: true, message: '璇烽�夋嫨搴撲綅灞炴�э紒' }]}]">
+ <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-switch v-decorator="['isSrmPlace', { valuePropName: 'checked' }]" />
@@ -140,6 +141,8 @@
sm: { span: 15 }
},
record: {},
+ placeTypeData: [],
+ placeStatusData: [],
visible: false,
confirmLoading: false,
form: this.$form.createForm(this)
@@ -155,6 +158,10 @@
});
//娣卞害鎷疯礉 绉婚櫎VUE鐨勭洃鍚紝闃叉INDEX椤甸潰鍊煎彉鍔�
this.record = JSON.parse(JSON.stringify(record))
+ const placeTypeOption = this.$options
+ this.placeTypeData = placeTypeOption.filters['dictData']('place_type')
+ const placeStatusOption = this.$options
+ this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
this.$nextTick(() => {
this.form.setFieldsValue(
{
@@ -164,7 +171,6 @@
placeAlias: record.placeAlias,
placeType: record.placeType,
placeTypeName: record.placeTypeName,
- stockUnit: record.stockUnit,
placeStatus: record.placeStatus,
isSrmPlace: record.isSrmPlace,
srmPlaceNo: record.srmPlaceNo,
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 b63d919..9c3a2a2 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
@@ -22,21 +22,20 @@
</a-form-item>
</a-col><a-col :md="8" :sm="24">
<a-form-item label="搴撲綅绫诲瀷">
- <a-input-number v-model="queryParam.placeType" style="width: 100%" allow-clear placeholder="璇疯緭鍏ュ簱浣嶇被鍨�"/>
+ <a-select :allowClear="true" style="width: 100%" v-model="queryParam.placeType" placeholder="璇烽�夋嫨搴撲綅绫诲瀷">
+ <a-select-option v-for="(item,index) in placeTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
<a-form-item label="搴撲綅绫诲瀷鍚嶇О">
<a-input v-model="queryParam.placeTypeName" allow-clear placeholder="璇疯緭鍏ュ簱浣嶇被鍨嬪悕绉�"/>
</a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="瀛樻斁鍗曚綅">
- <a-input v-model="queryParam.stockUnit" allow-clear placeholder="璇疯緭鍏ュ瓨鏀惧崟浣�"/>
- </a-form-item>
</a-col><a-col :md="8" :sm="24">
<a-form-item label="搴撲綅灞炴��">
- <a-input-number v-model="queryParam.placeStatus" style="width: 100%" allow-clear placeholder="璇疯緭鍏ュ簱浣嶅睘鎬�"/>
+ <a-select :allowClear="true" style="width: 100%" v-model="queryParam.placeStatus" placeholder="璇烽�夋嫨搴撲綅灞炴��">
+ <a-select-option v-for="(item,index) in placeStatusData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
@@ -218,17 +217,7 @@
</a-form-item>
</a-col>
-
- <a-col :md="8" :sm="24">
- <a-form-item label="鍒涘缓鑰呭悕绉�">
- <a-input v-model="queryParam.createdUserName" allow-clear placeholder="璇疯緭鍏ュ垱寤鸿�呭悕绉�"/>
- </a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="淇敼鑰呭悕绉�">
- <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="璇疯緭鍏ヤ慨鏀硅�呭悕绉�"/>
- </a-form-item>
- </a-col> </template>
+ </template>
<a-col :md="8" :sm="24" >
<span class="table-page-search-submitButtons">
@@ -266,6 +255,12 @@
<a-button type="primary" v-if="hasPerm('WmsPlace:add')" icon="plus" @click="$refs.addForm.add()">鏂板搴撲綅淇℃伅</a-button>
</div>
</template>
+ <span slot="placeTypescopedSlots" slot-scope="text">
+ {{ 'place_type' | dictType(text) }}
+ </span>
+ <span slot="placeStatusscopedSlots" slot-scope="text">
+ {{ 'place_status' | dictType(text) }}
+ </span>
<span slot="isSrmPlacescopedSlots" slot-scope="text">
<div v-if="text===true ">
<a-tag color="green">鏄�</a-tag>
@@ -444,19 +439,20 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
sorter: true,
- dataIndex: 'placeType'
+ dataIndex: 'placeType',
+ scopedSlots: { customRender: 'placeTypescopedSlots' }
},
{
title: '搴撲綅绫诲瀷鍚嶇О',
@@ -479,44 +475,25 @@
dataIndex: 'placeTypeName'
},
{
- title: '瀛樻斁鍗曚綅',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'stockUnit'
- },
- {
title: '搴撲綅灞炴��',
align: 'center',
customHeaderCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
sorter: true,
- dataIndex: 'placeStatus'
+ dataIndex: 'placeStatus',
+ scopedSlots: { customRender: 'placeStatusscopedSlots' }
},
{
title: '鏄惁鍫嗗灈鏈哄簱浣�',
@@ -1193,6 +1170,8 @@
return res.data
})
},
+ placeTypeData: [],
+ placeStatusData: [],
selectedRowKeys: [],
selectedRows: []
}
@@ -1219,6 +1198,10 @@
}
});
}
+ const placeTypeOption = this.$options
+ this.placeTypeData = placeTypeOption.filters['dictData']('place_type')
+ const placeStatusOption = this.$options
+ this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
const isSrmPlaceOption = this.$options
this.isSrmPlaceData = isSrmPlaceOption.filters['dictData']('yes_true_false')
const isRgvPlaceOption = this.$options
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
index 95805a1..7ac1c0d 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
@@ -63,7 +63,7 @@
.Where(input.MaterialType != null, u => u.MaterialType == input.MaterialType)
.Where(!string.IsNullOrEmpty(input.MaterialGroup), u => u.MaterialGroup == input.MaterialGroup)
.Where(!string.IsNullOrEmpty(input.ABCClassName), u => u.ABCClassName == input.ABCClassName)
- .Where(input.ABCClass != null, u => u.ABCClass == input.ABCClass)
+ //.Where(input.ABCClass != null, u => u.ABCClass == input.ABCClass)
.Where(!string.IsNullOrEmpty(input.MaterialSpec), u => u.MaterialSpec == input.MaterialSpec)
.Where(!string.IsNullOrEmpty(input.InPlaceCode), u => u.InPlaceCode == input.InPlaceCode)
.Where(!string.IsNullOrEmpty(input.MaterialUnit), u => u.MaterialUnit == input.MaterialUnit)
@@ -128,7 +128,7 @@
.Where(pMaterialType != null, u => u.MaterialType == pMaterialType)
.Where(!string.IsNullOrEmpty(pMaterialGroup), u => u.MaterialGroup == pMaterialGroup)
.Where(!string.IsNullOrEmpty(pABCClassName), u => u.ABCClassName == pABCClassName)
- .Where(pABCClass != null, u => u.ABCClass == pABCClass)
+ //.Where(pABCClass != null, u => u.ABCClass == pABCClass)
.Where(!string.IsNullOrEmpty(pMaterialSpec), u => u.MaterialSpec == pMaterialSpec)
.Where(!string.IsNullOrEmpty(pInPlaceCode), u => u.InPlaceCode == pInPlaceCode)
.Where(!string.IsNullOrEmpty(pMaterialUnit), u => u.MaterialUnit == pMaterialUnit)
@@ -441,7 +441,7 @@
}
else
{
- addItem.ABCClass = outABCClass;
+ // addItem.ABCClass = outABCClass;
}
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs
index 3fe526a..9376174 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs
@@ -91,7 +91,7 @@
/// </summary>
[Comment("ABC鍒嗙被")]
- public int? ABCClass { get; set; }
+ public ABCClassEnum? ABCClass { get; set; }
/// <summary>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsMaterialEnum.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsMaterialEnum.cs
index 3f73207..1be7012 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsMaterialEnum.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsMaterialEnum.cs
@@ -139,4 +139,28 @@
[Description("T")]
T = 2
}
+
+ /// <summary>
+ /// 鐗╂枡ABC鍒嗙被
+ /// </summary>
+ public enum ABCClassEnum
+ {
+ /// <summary>
+ /// A
+ /// </summary>
+ [Description("A")]
+ A = 1,
+
+ /// <summary>
+ ///B
+ /// </summary>
+ [Description("B")]
+ B= 2,
+
+ /// <summary>
+ ///C
+ /// </summary>
+ [Description("C")]
+ C = 3
+ }
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
index 4321e81..e8bad2b 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
@@ -260,6 +260,10 @@
new SysDictData{Id=539733729484869, TypeId=539731668947013, Value="鍩虹搴撲綅", Code="2", Sort=100, Remark="", Status=0 },
new SysDictData{Id=539733806522437, TypeId=539731668947013, Value="缁勫悎搴撲綅", Code="3", Sort=100, Remark="", Status=0 },
+ new SysDictData{Id=539751848640581, TypeId=539751788187717, Value="A", Code="1", Sort=100, Remark="", Status=0 },
+ new SysDictData{Id=539751869472837, TypeId=539751788187717, Value="B", Code="2", Sort=100, Remark="", Status=0 },
+ new SysDictData{Id=539751888134213, TypeId=539751788187717, Value="C", Code="3", Sort=100, Remark="", Status=0 },
+
};
}
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
index 78b676d..eb5faf3 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
@@ -79,8 +79,8 @@
new SysDictType{Id=386522984120391, Name="鍗曟嵁鏄庣粏琛ㄧ姸鎬�", Code="orderdetails_statusenum", Sort=100, Remark="", Status=0 },
new SysDictType{Id=386522984120392, Name="鍗曟嵁澶х被", Code="orderlargecategory_Enum", Sort=100, Remark="", Status=0 },
new SysDictType{Id=386522984120393, Name="鍗曟嵁涓昏〃鐘舵��", Code="order_statusenum", Sort=100, Remark="", Status=0 },
-
+ new SysDictType{Id=539751788187717, Name="鐗╂枡ABC鍒嗙被", Code="order_statusenum", Sort=100, Remark="", Status=0 },
};
}
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsMaterialImport.xlsx b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsMaterialImport.xlsx
index a267795..0a407ec 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsMaterialImport.xlsx
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsMaterialImport.xlsx
Binary files differ
--
Gitblit v1.9.3