From 2306e1ff0c47d95864986f7e27c9d53a2d65ab59 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 11:21:39 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue | 8
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue | 8
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs | 4
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue | 8
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue | 8
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue | 8
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml | 514 +++-------------------------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue | 1
/dev/null | 420 -----------------------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue | 4
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/editForm.vue | 6
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 33 +
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue | 6
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue | 9
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue | 8
15 files changed, 152 insertions(+), 893 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue
index 95ff7be..0769e4a 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue
@@ -1,7 +1,7 @@
锘�<template>
<a-modal
title="鏂板瀹㈡埛妗ｆ"
- :width="900"
+ :width="1100"
:visible="visible"
:confirmLoading="confirmLoading"
@ok="handleSubmit"
@@ -121,3 +121,9 @@
}
}
</script>
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue
index 080d07e..b6688ec 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue
@@ -1,7 +1,7 @@
锘�<template>
<a-modal
title="缂栬緫瀹㈡埛妗ｆ"
- :width="900"
+ :width="1100"
:visible="visible"
:confirmLoading="confirmLoading"
@ok="handleSubmit"
@@ -146,3 +146,9 @@
}
}
</script>
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
index c02c4a8..b24126a 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
@@ -1,5 +1,5 @@
锘�<template>
- <a-modal title="鏂板搴撳尯淇℃伅" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
+ <a-modal title="鏂板搴撳尯淇℃伅" :width="1100" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
@@ -148,3 +148,9 @@
}
}
</script>
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
index 89430a3..f091b69 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
@@ -1,5 +1,5 @@
锘�<template>
- <a-modal title="缂栬緫搴撳尯淇℃伅" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
+ <a-modal title="缂栬緫搴撳尯淇℃伅" :width="1100" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
@@ -157,3 +157,9 @@
}
}
</script>
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
index 0ea1661..3937741 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
@@ -832,4 +832,5 @@
button {
margin-right: 8px;
}
+
</style>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
index 496e596..b8f7f93 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -192,7 +192,9 @@
</span>
<span slot="action" slot-scope="text, record">
- <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
+ <!-- <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a> -->
+ <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(record)">缂栬緫</a>
+
<a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')"/>
<a-popconfirm v-if="hasPerm('WmsMaterial:delete')" placement="topRight" title="纭鍒犻櫎锛�" @confirm="() => WmsMaterialDelete(record)">
<a>鍒犻櫎</a>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
index 22e6397..34da4a7 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -1,12 +1,12 @@
<template>
- <a-modal title="鏂板鍩虹鐗╂枡淇℃伅" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
+ <a-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<!-- tab -->
<a-tabs default-active-key="1" @change="callbacktab">
<a-tab-pane key="1" tab="鍩烘湰淇℃伅">
<!-- <add-form ref="addFormRef" @ok="handleOk" /> -->
- <!-- 鍩烘湰淇℃伅 -->
+ <!-- 鍩烘湰淇℃伅 layout="inline" layout="vertical" -->
<a-form :form="form">
<a-form-item label="鐗╂枡鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
@@ -145,6 +145,7 @@
},
data() {
return {
+ title: '',
labelCol: {
// xs: { span: 24 },
// sm: { span: 5 }
@@ -207,14 +208,21 @@
handleOk() { },
// 鍒濆鍖栨柟娉�
add(record) {
- this.visible = true
- // this.$nextTick(() => {
- // // this.getSelects()
- // })
const materialTypeOption = this.$options
- this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class')
- // const inspectionMethodOption = this.$options
- // this.inspectionMethodData = inspectionMethodOption.filters['dictData']('material_inspection')
+ this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class')
+
+ this.visible = true
+ if (record) {//缂栬緫
+ this.title = '缂栬緫鍩虹鐗╂枡淇℃伅';
+ this.$nextTick(() => {
+ this.form.setFieldsValue({
+ ...record
+ })
+ })
+
+ } else { // 鏂板
+ this.title = '鏂板鍩虹鐗╂枡淇℃伅';
+ }
},
getSelects() {
if (this.areaNameParameterData.length <= 0 || this.stationNameParameterData.length <= 0) {
@@ -327,3 +335,10 @@
}
}
</script>
+
+<style lang="less" scoped>
+.ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+}
+</style>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
index cffb421..78066dd 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
@@ -1,7 +1,8 @@
锘�<template>
<div>
+ <!--tab 鎺у埗灞炴�ц鍒欐槑缁� -->
<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 disabled placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欑紪鍙�" v-decorator="['ruleCode', {rules: [{required: true, message: '璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欑紪鍙凤紒'}]}]" />
</a-form-item>
<a-form-item label="鏈�楂樺簱瀛�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
@@ -110,3 +111,9 @@
}
}
</script>
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
\ No newline at end of file
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 a8c01c2..b1ed5b1 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
@@ -1,5 +1,5 @@
锘�<template>
- <a-modal title="鏂板搴撲綅淇℃伅" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
+ <a-modal title="鏂板搴撲綅淇℃伅" :width="1100" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
@@ -209,3 +209,9 @@
}
}
</script>
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
\ No newline at end of file
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 8336ea2..79ab521 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
@@ -1,7 +1,7 @@
锘�<template>
<a-modal
title="缂栬緫搴撲綅淇℃伅"
- :width="900"
+ :width="1100"
:visible="visible"
:confirmLoading="confirmLoading"
@ok="handleSubmit"
@@ -243,3 +243,9 @@
}
}
</script>
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
\ No newline at end of file
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 1d1cb16..ce4ea2c 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue
@@ -127,3 +127,9 @@
}
}
</script>
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/editForm.vue
index a4a5657..df23685 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/editForm.vue
@@ -149,3 +149,9 @@
}
}
</script>
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsPlace/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsPlace/addForm.vue
deleted file mode 100644
index 7b9af1a..0000000
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsPlace/addForm.vue
+++ /dev/null
@@ -1,161 +0,0 @@
-锘�<template>
- <a-modal
- title="鏂板搴撲綅淇℃伅"
- :width="900"
- :visible="visible"
- :confirmLoading="confirmLoading"
- @ok="handleSubmit"
- @cancel="handleCancel">
- <a-spin :spinning="confirmLoading">
- <a-form :form="form">
- <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 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.code">{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item>
- <a-form-item label="鎺�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ユ帓" style="width: 100%" v-decorator="['rowno', {rules: [{ required: true, message: '璇疯緭鍏ユ帓锛�' }]}]" :min="0"/>
- </a-form-item>
- <a-form-item label="鍒�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ垪" style="width: 100%" v-decorator="['columnno', {rules: [{ required: true, message: '璇疯緭鍏ュ垪锛�' }]}]" :min="0"/>
- </a-form-item>
- <a-form-item label="灞�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ眰" style="width: 100%" v-decorator="['layerno', {rules: [{ required: true, message: '璇疯緭鍏ュ眰锛�' }]}]" :min="0"/>
- </a-form-item>
- <a-form-item label="宸烽亾" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ贩閬�" style="width: 100%" v-decorator="['aisle', {rules: [{ required: true, message: '璇疯緭鍏ュ贩閬擄紒' }]}]" :min="0"/>
- </a-form-item>
- <a-form-item label="杩涙繁鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ヨ繘娣卞彿" style="width: 100%" v-decorator="['deepcellno']" :min="0"/>
- </a-form-item>
-
- <a-form-item label="绾垮彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ョ嚎鍙�" style="width: 100%" v-decorator="['line']" :min="0"/>
- </a-form-item>
- <a-form-item label="鍫嗗灈鏈哄唴閮ㄤ綅缃�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ爢鍨涙満鍐呴儴浣嶇疆" v-decorator="['positionnoForSrm']" />
- </a-form-item>
- <a-form-item label="搴撲綅X鍧愭爣" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣峏鍧愭爣" style="width: 100%" v-decorator="['xzb']" :min="0"/>
- </a-form-item>
- <a-form-item label="搴撲綅Y鍧愭爣" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣峐鍧愭爣" style="width: 100%" v-decorator="['yzb']" :min="0"/>
- </a-form-item>
- <a-form-item label="搴撲綅Z鍧愭爣" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣峑鍧愭爣" style="width: 100%" v-decorator="['zzb']" :min="0"/>
- </a-form-item>
- <a-form-item label="搴撲綅闀垮害" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣嶉暱搴�" style="width: 100%" v-decorator="['length']" :min="0"/>
- </a-form-item>
- <a-form-item label="搴撲綅瀹藉害" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣嶅搴�" style="width: 100%" v-decorator="['width']" :min="0"/>
- </a-form-item>
- <a-form-item label="搴撲綅楂樺害" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣嶉珮搴�" style="width: 100%" v-decorator="['height']" :min="0"/>
- </a-form-item>
- <a-form-item label="鏈�澶ф壙閲�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ユ渶澶ф壙閲�" style="width: 100%" v-decorator="['maxweight']" :min="0"/>
- </a-form-item>
- <a-form-item label="搴撲綅楂樺害绾у埆" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撲綅楂樺害绾у埆" v-decorator="['heightlevel']">
- <a-select-option v-for="(item,index) in heightlevelData" :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-number placeholder="璇疯緭鍏ヤ紭鍏堢骇" style="width: 100%" v-decorator="['priority']" :min="0"/>
- </a-form-item>
- </a-form>
- </a-spin>
- </a-modal>
-</template>
-
-<script>
- import {
- WmsPlaceFkWmsAreaList,
- WmsPlaceAdd
- } from '@/api/modular/main/WmsPlaceManage'
- export default {
- data () {
- return {
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 15 }
- },
- WmsAreaData: [],
- visible: false,
- confirmLoading: false,
- heightlevelData: [],
- form: this.$form.createForm(this)
- }
- },
- methods: {
- WmsPlaceFkWmsAreaList() {
- WmsPlaceFkWmsAreaList().then(res => {
- this.WmsAreaData = res.data
- })
- },
- // 鍒濆鍖栨柟娉�
- add (record) {
- this.visible = true
- this.$nextTick(() => {
-
- })
- const placestatusOption = this.$options
- this.placestatusData = placestatusOption.filters['dictData']('place_status')
- const islockOption = this.$options
- this.islockData = islockOption.filters['dictData']('yes_or_no')
- const isfullOption = this.$options
- this.isfullData = isfullOption.filters['dictData']('yes_or_no')
- const hastaskdoingOption = this.$options
- this.hastaskdoingData = hastaskdoingOption.filters['dictData']('yes_or_no')
- const heightlevelOption = this.$options
- this.heightlevelData = heightlevelOption.filters['dictData']('height_level')
- this.WmsPlaceFkWmsAreaList()
- },
- /**
- * 鎻愪氦琛ㄥ崟
- */
- handleSubmit () {
- const { form: { validateFields } } = this
- this.confirmLoading = true
- validateFields((errors, values) => {
- if (!errors) {
- for (const key in values) {
- if (values[key] == null) {
- values[key] = 0
- }
- if (typeof (values[key]) === 'object') {
- values[key] = JSON.stringify(values[key])
- }
- }
- WmsPlaceAdd(values).then((res) => {
- if (res.success) {
- this.$message.success('鏂板鎴愬姛')
- this.confirmLoading = false
- this.$emit('ok', values)
- this.handleCancel()
- } else {
- this.$message.error('鏂板澶辫触锛�' + JSON.stringify(res.message))
- }
- }).finally((res) => {
- this.confirmLoading = false
- })
- } else {
- this.confirmLoading = false
- }
- })
- },
- handleCancel () {
- this.form.resetFields()
- this.visible = false
- }
- }
- }
-</script>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsPlace/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsPlace/editForm.vue
deleted file mode 100644
index 381b8cc..0000000
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsPlace/editForm.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-锘�<template>
- <a-modal
- title="缂栬緫搴撲綅淇℃伅"
- :width="900"
- :visible="visible"
- :confirmLoading="confirmLoading"
- @ok="handleSubmit"
- @cancel="handleCancel"
- >
- <a-spin :spinning="confirmLoading">
- <a-form :form="form">
- <a-form-item label="缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input
- disabled
- placeholder="璇疯緭鍏ョ紪鐮�"
- v-decorator="['placecode', { rules: [{ required: true, message: '璇疯緭鍏ョ紪鐮侊紒' }] }]"
- />
- </a-form-item>
- <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.code">{{
- item.name
- }}</a-select-option>
- </a-select>
- </a-form-item>
- <a-form-item label="鎺�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ユ帓" style="width: 100%" v-decorator="['rowno']" :min="0" />
- </a-form-item>
- <a-form-item label="鍒�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ垪" style="width: 100%" v-decorator="['columnno']" :min="0" />
- </a-form-item>
- <a-form-item label="灞�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ眰" style="width: 100%" v-decorator="['layerno']" :min="0" />
- </a-form-item>
- <a-form-item label="宸烽亾" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number
- placeholder="璇疯緭鍏ュ贩閬�"
- style="width: 100%"
- v-decorator="['aisle', { rules: [{ required: true, message: '璇疯緭鍏ュ贩閬擄紒' }] }]"
- :min="0"
- />
- </a-form-item>
- <a-form-item label="杩涙繁鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ヨ繘娣卞彿" style="width: 100%" v-decorator="['deepcellno']" :min="0" />
- </a-form-item>
- <a-form-item label="绾垮彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ョ嚎鍙�" style="width: 100%" v-decorator="['line']" :min="0" />
- </a-form-item>
- <a-form-item label="鍫嗗灈鏈哄唴閮ㄤ綅缃�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ爢鍨涙満鍐呴儴浣嶇疆" v-decorator="['positionnoForSrm']" />
- </a-form-item>
- <a-form-item label="搴撲綅X鍧愭爣" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣峏鍧愭爣" style="width: 100%" v-decorator="['xzb']" :min="0" />
- </a-form-item>
- <a-form-item label="搴撲綅Y鍧愭爣" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣峐鍧愭爣" style="width: 100%" v-decorator="['yzb']" :min="0" />
- </a-form-item>
- <a-form-item label="搴撲綅Z鍧愭爣" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣峑鍧愭爣" style="width: 100%" v-decorator="['zzb']" :min="0" />
- </a-form-item>
- <a-form-item label="搴撲綅闀垮害" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣嶉暱搴�" style="width: 100%" v-decorator="['length']" :min="0" />
- </a-form-item>
- <a-form-item label="搴撲綅瀹藉害" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣嶅搴�" style="width: 100%" v-decorator="['width']" :min="0" />
- </a-form-item>
- <a-form-item label="搴撲綅楂樺害" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣嶉珮搴�" style="width: 100%" v-decorator="['height']" :min="0" />
- </a-form-item>
- <a-form-item label="鏈�澶ф壙閲�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ユ渶澶ф壙閲�" style="width: 100%" v-decorator="['maxweight']" :min="0" />
- </a-form-item>
- <a-form-item label="搴撲綅楂樺害绾у埆" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撲綅楂樺害绾у埆" v-decorator="['heightlevel']">
- <a-select-option v-for="(item, index) in heightlevelData" :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-number placeholder="璇疯緭鍏ヤ紭鍏堢骇" style="width: 100%" v-decorator="['priority']" :min="0" />
- </a-form-item>
- <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
- </a-form>
- </a-spin>
- </a-modal>
-</template>
-
-<script>
-import { WmsPlaceFkWmsAreaList, WmsPlaceEdit } from '@/api/modular/main/WmsPlaceManage'
-export default {
- data() {
- return {
- Id: 0,
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 15 }
- },
- record: {},
- WmsAreaData: [],
- heightlevelData: [],
- visible: false,
- confirmLoading: false,
- form: this.$form.createForm(this)
- }
- },
- methods: {
- WmsPlaceFkWmsAreaList() {
- WmsPlaceFkWmsAreaList().then((res) => {
- this.WmsAreaData = res.data
- })
- },
- // 鍒濆鍖栨柟娉�
- edit(record) {
- this.visible = true
- this.Id = record.id
- this.$nextTick(() => {})
- // 娣卞害鎷疯礉 绉婚櫎VUE鐨勭洃鍚紝闃叉INDEX椤甸潰鍊煎彉鍔�
- this.record = JSON.parse(JSON.stringify(record))
- const placestatusOption = this.$options
- this.placestatusData = placestatusOption.filters['dictData']('place_status')
- const islockOption = this.$options
- this.islockData = islockOption.filters['dictData']('yes_or_no')
- const isfullOption = this.$options
- this.isfullData = isfullOption.filters['dictData']('yes_or_no')
- const hastaskdoingOption = this.$options
- this.hastaskdoingData = hastaskdoingOption.filters['dictData']('yes_or_no')
- const heightlevelOption = this.$options
- this.heightlevelData = heightlevelOption.filters['dictData']('height_level')
- this.$nextTick(() => {
- this.form.setFieldsValue({
- id: record.id,
- placecode: record.placecode,
- areaid: record.areaid,
- rowno: record.rowno,
- columnno: record.columnno,
- layerno: record.layerno,
- deepcellno: record.deepcellno,
- aisle: record.aisle,
- line: record.line,
- positionnoForSrm: record.positionnoForSrm,
- xzb: record.xzb,
- yzb: record.yzb,
- zzb: record.zzb,
- length: record.length,
- width: record.width,
- height: record.height,
- maxweight: record.maxweight,
- heightlevel: record.heightlevel + '',
- priority: record.priority
- })
- })
- this.WmsPlaceFkWmsAreaList()
- },
- handleSubmit() {
- const {
- form: { validateFields }
- } = this
- this.confirmLoading = true
- validateFields((errors, values) => {
- if (!errors) {
- for (const key in values) {
- if (values[key] == null) continue
- if (typeof values[key] === 'object') {
- values[key] = JSON.stringify(values[key])
- this.record[key] = values[key]
- } else {
- this.record[key] = values[key]
- }
- }
- WmsPlaceEdit(this.record)
- .then((res) => {
- if (res.success) {
- this.$message.success('缂栬緫鎴愬姛')
- this.confirmLoading = false
- this.$emit('ok', this.record)
- this.handleCancel()
- } else {
- this.$message.error('缂栬緫澶辫触锛�' + JSON.stringify(res.message))
- }
- })
- .finally((res) => {
- this.confirmLoading = false
- })
- } else {
- this.confirmLoading = false
- }
- })
- },
- handleCancel() {
- this.form.resetFields()
- this.visible = false
- }
- }
-}
-</script>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsPlace/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsPlace/index.vue
deleted file mode 100644
index fdba0b8..0000000
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsPlace/index.vue
+++ /dev/null
@@ -1,420 +0,0 @@
-锘�<template>
- <div>
- <a-card :bordered="false" :bodyStyle="tstyle">
- <div class="table-page-search-wrapper" v-if="hasPerm('WmsPlace:page')">
- <a-form layout="inline">
- <a-row :gutter="48">
- <a-col :md="8" :sm="24">
- <a-form-item label="缂栫爜">
- <a-input v-model="queryParam.placecode" allow-clear placeholder="璇疯緭鍏ョ紪鐮�" />
- </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="璇烽�夋嫨鐘舵��"
- >
- <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>
- <template v-if="advanced">
- <a-col :md="8" :sm="24">
- <a-form-item label="鎵�鍦ㄥ簱鍖�">
- <a-select
- :allowClear="true"
- style="width: 100%"
- v-model="queryParam.areaId"
- placeholder="璇烽�夋嫨鎵�鍦ㄥ簱鍖�"
- >
- <a-select-option v-for="(item, index) in areaNameData" :key="index" :value="item.id">{{
- item.areaName
- }}</a-select-option>
- </a-select>
- </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.islock"
- placeholder="璇烽�夋嫨鏄惁閿佸畾"
- >
- <a-select-option v-for="(item, index) in islockData" :key="index" :value="item.code">{{
- item.name
- }}</a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- </template>
- <a-col :md="8" :sm="24">
- <span class="table-page-search-submitButtons">
- <a-button type="primary" @click="$refs.table.refresh(true)">鏌ヨ</a-button>
- <a-button style="margin-left: 8px" @click="() => (queryParam = {})">閲嶇疆</a-button>
- <a @click="toggleAdvanced" style="margin-left: 8px">
- {{ advanced ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="advanced ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
- </a-row>
- </a-form>
- </div>
- </a-card>
- <a-card :bordered="false">
- <s-table
- ref="table"
- :columns="columns"
- :data="loadData"
- :scroll="{ x: 2000 }"
- :alert="true"
- :rowKey="(record) => record.id"
- :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
- >
- <template class="table-operator" slot="operator" v-if="hasPerm('WmsPlace:add')">
- <a-button
- type="primary"
- v-if="hasPerm('WmsPlace:add')"
- icon="plus"
- @click="$refs.addForm.add()"
- >鏂板</a-button
- >
- <a-button
- type="danger"
- icon="lock"
- :disabled="selectedCounldLocks.length === 0"
- @click="onMulLock"
- >鎵归噺閿佸畾</a-button
- >
- <a-button
- type="danger"
- icon="unlock"
- :disabled="selectedCounldUnLocks.length === 0"
- @click="onMulUnlock"
- >鎵归噺瑙ｉ攣</a-button
- >
- </template>
- <span slot="placestatusscopedSlots" slot-scope="text">
- <a-tag :color="text === 1 ? '#87d068' : text === 2 ? '#2db7f5' : text === 3 ? '#D4B60F' : '#108ee9'">{{
- 'place_status' | dictType(text)
- }}</a-tag>
- </span>
- <span slot="islockscopedSlots" slot-scope="text">
- <a-tag :color="text === 1 ? '#108ee9' : 'gray'">{{ 'yes_or_no' | dictType(text) }}</a-tag>
- </span>
- <span slot="emptyContainerSlots" slot-scope="text">
- <a-tag :color="text === 1 ? '#108ee9' : 'gray'">{{ 'yes_or_no' | dictType(text) }}</a-tag>
- </span>
- <span slot="heightlevelscopedSlots" slot-scope="text">
- {{ 'height_level' | dictType(text) }}
- </span>
- <span slot="action" slot-scope="text, record">
- <a v-if="hasPerm('WmsContainer:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
- <a-divider type="vertical" v-if="hasPerm('WmsContainer:edit') & hasPerm('WmsContainer:delete')" />
- <a-popconfirm
- v-if="hasPerm('WmsContainer:delete')"
- placement="topRight"
- title="纭鍒犻櫎锛�"
- @confirm="() => WmsPlaceDelete(record)"
- >
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </span>
- </s-table>
- <add-form ref="addForm" @ok="handleOk" />
- <edit-form ref="editForm" @ok="handleOk" />
- </a-card>
- </div>
-</template>
-<script>
-import { STable } from '@/components'
-import { WmsPlacePage, WmsPlaceDelete, WmsPlaceLock, WmsPlaceUnlock } from '@/api/modular/main/WmsPlaceManage'
-import { WmsAreaList } from '@/api/modular/main/WmsAreaManage'
-import addForm from './addForm.vue'
-import editForm from './editForm.vue'
-export default {
- components: {
- STable,
- addForm,
- editForm
- },
- data() {
- return {
- advanced: false, // 楂樼骇鎼滅储 灞曞紑/鍏抽棴
- queryParam: {},
- columns: [
- {
- title: '搴撲綅缂栫爜',
- align: 'center',
- sorter: true,
- dataIndex: 'placecode'
- },
- {
- title: '搴撲綅鐘舵��',
- align: 'center',
- dataIndex: 'placestatus',
- scopedSlots: { customRender: 'placestatusscopedSlots' }
- },
- {
- title: '鎵�鍦ㄥ簱鍖�',
- align: 'center',
- customRender: (value, record) => record.wmsArea.areaName,
- dataIndex: 'areaid'
- },
- {
- title: '鎺�',
- align: 'center',
- dataIndex: 'rowno'
- },
- {
- title: '鍒�',
- align: 'center',
- dataIndex: 'columnno'
- },
- {
- title: '灞�',
- align: 'center',
- dataIndex: 'layerno'
- },
- {
- title: '杩涙繁鍙�',
- align: 'center',
- dataIndex: 'deepcellno'
- },
- {
- title: '宸烽亾',
- align: 'center',
- dataIndex: 'aisle'
- },
- {
- title: '绾垮彿',
- align: 'center',
- dataIndex: 'line'
- },
- {
- title: '鏄惁閿佸畾',
- align: 'center',
- dataIndex: 'islock',
- scopedSlots: { customRender: 'islockscopedSlots' }
- },
- {
- title: '鏄惁绌烘墭',
- align: 'center',
- dataIndex: 'emptyContainer',
- scopedSlots: { customRender: 'emptyContainerSlots' }
- },
- {
- title: '搴撲綅闀垮害(m)',
- align: 'center',
- dataIndex: 'length'
- },
- {
- title: '搴撲綅瀹藉害(m)',
- align: 'center',
- dataIndex: 'width'
- },
- {
- title: '搴撲綅楂樺害(m)',
- align: 'center',
- dataIndex: 'height'
- },
- {
- title: '搴撲綅X鍧愭爣',
- align: 'center',
- dataIndex: 'xzb'
- },
- {
- title: '搴撲綅Y鍧愭爣',
- align: 'center',
- dataIndex: 'yzb'
- },
- {
- title: '搴撲綅Z鍧愭爣',
- align: 'center',
- dataIndex: 'zzb'
- },
- {
- title: '鍫嗗灈鏈哄唴閮ㄤ綅缃�',
- align: 'center',
- dataIndex: 'positionnoForSrm'
- },
- {
- title: '鏈�澶ф壙閲�',
- align: 'center',
- dataIndex: 'maxweight'
- },
- {
- title: '搴撲綅楂樺害绛夌骇',
- align: 'center',
- dataIndex: 'heightlevel',
- scopedSlots: { customRender: 'heightlevelscopedSlots' }
- },
- {
- title: '浼樺厛绾�',
- align: 'center',
- dataIndex: 'priority'
- }
- ],
- tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
- // 鍔犺浇鏁版嵁鏂规硶 蹇呴』涓� Promise 瀵硅薄
- loadData: (parameter) => {
- return WmsPlacePage(Object.assign(parameter, this.queryParam)).then((res) => {
- res.data.rows = res.data.rows.map((_obj) => {
- _obj.placestatus = _obj.placestatus.toString()
- return _obj
- })
- // 鍓嶅彴鑾峰彇鏁版嵁骞剁紪鍐欐垚绉嶅瓙鏁版嵁鐨勬ā鏉�
- // console.log(res.data.rows[0]);
- // var ShuChu="";
- // for(var i=res.data.rows.length-1; i>=0 ; i--){
- // ShuChu+="new 搴撲綅淇℃伅{Id="+res.data.rows[i]['id']+",Aisle="+res.data.rows[i]['aisle']+",Aisleside=\""+res.data.rows[i]['aisleside']+"\",Areaid="+res.data.rows[i]['areaid']+",Columnno="+res.data.rows[i]['columnno']+",Deepcellno="+res.data.rows[i]['deepcellno']+",Hastaskdoing="+res.data.rows[i]['hastaskdoing']+",Height="+res.data.rows[i]['height']+",Heightlevel="+res.data.rows[i]['heightlevel']+",Isfull="+res.data.rows[i]['isfull']+",Islock=\""+res.data.rows[i]['islock']+"\",Layerno="+res.data.rows[i]['layerno']+",Length="+res.data.rows[i]['length']+",Line="+res.data.rows[i]['line']+",Maxweight="+res.data.rows[i]['maxweight']+",Placecode=\""+res.data.rows[i]['placecode']+"\",Placestatus="+res.data.rows[i]['placestatus']+",Priority="+res.data.rows[i]['priority']+",Rowno="+res.data.rows[i]['rowno']+",Width="+res.data.rows[i]['width']+",}"
- // }
- // console.log(ShuChu)
- return res.data
- })
- },
- placestatusData: [],
- islockData: [],
- hastaskdoingData: [],
- selectedRowKeys: [],
- selectedCounldLocks: [],
- selectedCounldUnLocks: []
- }
- },
- created() {
- if (this.hasPerm('WmsPlace:edit') || this.hasPerm('WmsPlace:delete')) {
- this.columns.push({
- title: '鎿嶄綔',
- width: '150px',
- fixed: 'right',
- align: 'center',
- dataIndex: 'action',
- scopedSlots: { customRender: 'action' }
- })
- }
- const placestatusOption = this.$options
- this.placestatusData = placestatusOption.filters['dictData']('place_status')
- const islockOption = this.$options
- this.islockData = islockOption.filters['dictData']('yes_or_no')
- const hastaskdoingOption = this.$options
- this.hastaskdoingData = hastaskdoingOption.filters['dictData']('yes_or_no')
- },
- mounted() {
- this.WmsAreaLists()
- },
- methods: {
- WmsAreaLists() {
- WmsAreaList()
- .then((d) => {
- this.areaNameData = d.data || []
- })
- .catch(() => {})
- },
- /**
- * 鏌ヨ鍙傛暟缁勮
- */
- switchingDate() {
- const obj = JSON.parse(JSON.stringify(this.queryParam))
- return obj
- },
- WmsPlaceDelete(record) {
- WmsPlaceDelete(record).then((res) => {
- if (res.success) {
- this.$message.success('鍒犻櫎鎴愬姛')
- this.$refs.table.refresh()
- } else {
- this.$message.error('鍒犻櫎澶辫触') // + res.message
- }
- })
- },
- toggleAdvanced() {
- this.advanced = !this.advanced
- },
- handleOk() {
- this.$refs.table.refresh()
- },
- onSelectChange(selectedRowKeys, selectedRows) {
- this.selectedRowKeys = selectedRowKeys
- const arr1 = []
- const arr2 = []
- selectedRows.forEach((item) => {
- if (item.islock === 1) {
- arr2.push(item.id)
- } else {
- arr1.push(item.id)
- }
- })
- this.selectedCounldLocks = arr1
- this.selectedCounldUnLocks = arr2
- },
- onMulLock() {
- this.$confirm({
- title: '纭畾瑕佽繘琛岄攣瀹氭搷浣滃悧锛�',
- okText: '纭畾',
- okType: 'danger',
- cancelText: '鍙栨秷',
- onOk: () => {
- this.handleLock((f) => {
- if (f) {
- this.$refs.table.refresh()
- }
- })
- }
- })
- },
- onMulUnlock() {
- this.$confirm({
- title: '纭畾瑕佽繘琛岃В閿佹搷浣滃悧锛�',
- okText: '纭畾',
- okType: 'danger',
- cancelText: '鍙栨秷',
- onOk: () => {
- this.handleUnlock((f) => {
- if (f) {
- this.$refs.table.refresh()
- }
- })
- }
- })
- },
- handleLock(callback) {
- this.$loading.show()
- WmsPlaceLock(this.selectedCounldLocks)
- .then(() => {
- this.$loading.hide()
- callback(true)
- })
- .catch(() => {
- this.$loading.hide()
- callback(false)
- })
- },
- handleUnlock(callback) {
- this.$loading.show()
- WmsPlaceUnlock(this.selectedCounldUnLocks)
- .then(() => {
- this.$loading.hide()
- callback(true)
- })
- .catch(() => {
- this.$loading.hide()
- callback(false)
- })
- }
- }
-}
-</script>
-<style lang="less">
-.table-operator {
- margin-bottom: 18px;
-}
-button {
- margin-right: 8px;
-}
-</style>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
index 625a7ac..0950e3c 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
@@ -13597,61 +13597,61 @@
</member>
<member name="T:Admin.NET.Application.BaseCustomerService">
<summary>
- 瀹㈡埛妗ｆ鏈嶅姟
+ 寰�鏉ュ叧绯绘湇鍔�
</summary>
</member>
<member name="M:Admin.NET.Application.BaseCustomerService.Page(Admin.NET.Application.BaseCustomerSearch)">
<summary>
- 鍒嗛〉鏌ヨ瀹㈡埛妗ｆ
+ 鍒嗛〉鏌ヨ寰�鏉ュ叧绯�
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Admin.NET.Application.BaseCustomerService.ListNonPageAsync(Admin.NET.Application.BaseCustomerSearchNonPage)">
<summary>
- 涓嶅垎椤垫煡璇㈠鎴锋。妗堝垪琛�
+ 涓嶅垎椤垫煡璇㈠線鏉ュ叧绯诲垪琛�
</summary>
- <param name="input">瀹㈡埛妗ｆ鏌ヨ鍙傛暟</param>
- <returns>(瀹㈡埛妗ｆ)瀹炰緥鍒楄〃</returns>
+ <param name="input">寰�鏉ュ叧绯绘煡璇㈠弬鏁�</param>
+ <returns>(寰�鏉ュ叧绯�)瀹炰緥鍒楄〃</returns>
</member>
<member name="M:Admin.NET.Application.BaseCustomerService.Get(Admin.NET.Application.QueryeBaseCustomerInput)">
<summary>
- 鑾峰彇瀹㈡埛妗ｆ
+ 鑾峰彇寰�鏉ュ叧绯�
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Admin.NET.Application.BaseCustomerService.List(Admin.NET.Application.BaseCustomerInput)">
<summary>
- 鑾峰彇瀹㈡埛妗ｆ鍒楄〃
+ 鑾峰彇寰�鏉ュ叧绯诲垪琛�
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Admin.NET.Application.BaseCustomerService.Add(Admin.NET.Application.AddBaseCustomerInput)">
<summary>
- 澧炲姞瀹㈡埛妗ｆ
+ 澧炲姞寰�鏉ュ叧绯�
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Admin.NET.Application.BaseCustomerService.Delete(Admin.NET.Application.DeleteBaseCustomerInput)">
<summary>
- 鍒犻櫎瀹㈡埛妗ｆ
+ 鍒犻櫎寰�鏉ュ叧绯�
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Admin.NET.Application.BaseCustomerService.Update(Admin.NET.Application.UpdateBaseCustomerInput)">
<summary>
- 鏇存柊瀹㈡埛妗ｆ
+ 鏇存柊寰�鏉ュ叧绯�
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Admin.NET.Application.BaseCustomerService.ImportExcelAsync(Microsoft.AspNetCore.Http.IFormFile)">
<summary>
- Excel妯℃澘瀵煎叆瀹㈡埛妗ｆ鍔熻兘
+ Excel妯℃澘瀵煎叆寰�鏉ュ叧绯诲姛鑳�
</summary>
<param name="file">Excel妯℃澘鏂囦欢</param>
<returns>瀵煎叆鐨勮褰曟暟</returns>
@@ -13666,7 +13666,7 @@
</member>
<member name="M:Admin.NET.Application.BaseCustomerService.DownloadExcelTemplate(System.String)">
<summary>
- 鏍规嵁鐗堟湰涓嬭浇瀹㈡埛妗ｆ鐨凟xcel瀵煎叆妯℃澘
+ 鏍规嵁鐗堟湰涓嬭浇寰�鏉ュ叧绯荤殑Excel瀵煎叆妯℃澘
</summary>
<param name="version">妯℃澘鐗堟湰</param>
<returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
@@ -13688,7 +13688,7 @@
</member>
<member name="T:Admin.NET.Application.BaseCustomerSearch">
<summary>
- 瀹㈡埛妗ｆ鏌ヨ鍙傛暟
+ 寰�鏉ュ叧绯绘煡璇㈠弬鏁�
</summary>
</member>
<member name="P:Admin.NET.Application.BaseCustomerSearch.CustCode">
@@ -13783,7 +13783,7 @@
</member>
<member name="T:Admin.NET.Application.BaseCustomerSearchNonPage">
<summary>
- 瀹㈡埛妗ｆ涓嶅垎椤垫煡璇㈠弬鏁�
+ 寰�鏉ュ叧绯讳笉鍒嗛〉鏌ヨ鍙傛暟
</summary>
</member>
<member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.CustCode">
@@ -13878,12 +13878,7 @@
</member>
<member name="T:Admin.NET.Application.BaseCustomerInput">
<summary>
- 瀹㈡埛妗ｆ杈撳叆鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.BaseCustomerInput.CustCode">
- <summary>
- 瀹㈡埛缂栧彿
+ 寰�鏉ュ叧绯昏緭鍏ュ弬鏁�
</summary>
</member>
<member name="P:Admin.NET.Application.BaseCustomerInput.CustChinaName">
@@ -13904,11 +13899,6 @@
<member name="P:Admin.NET.Application.BaseCustomerInput.CustType">
<summary>
绫诲瀷
- </summary>
- </member>
- <member name="P:Admin.NET.Application.BaseCustomerInput.CustTypeName">
- <summary>
- 绫诲瀷鍚嶇О
</summary>
</member>
<member name="P:Admin.NET.Application.BaseCustomerInput.LinkMan">
@@ -13953,17 +13943,17 @@
</member>
<member name="T:Admin.NET.Application.AddBaseCustomerInput">
<summary>
- 瀹㈡埛妗ｆ鏂板鍙傛暟
+ 寰�鏉ュ叧绯绘柊澧炲弬鏁�
</summary>
</member>
<member name="T:Admin.NET.Application.DeleteBaseCustomerInput">
<summary>
- 瀹㈡埛妗ｆ鍒犻櫎鍙傛暟
+ 寰�鏉ュ叧绯诲垹闄ゅ弬鏁�
</summary>
</member>
<member name="T:Admin.NET.Application.UpdateBaseCustomerInput">
<summary>
- 瀹㈡埛妗ｆ鏇存柊鍙傛暟
+ 寰�鏉ュ叧绯绘洿鏂板弬鏁�
</summary>
</member>
<member name="P:Admin.NET.Application.UpdateBaseCustomerInput.Id">
@@ -13973,12 +13963,12 @@
</member>
<member name="T:Admin.NET.Application.QueryeBaseCustomerInput">
<summary>
- 瀹㈡埛妗ｆ鑾峰彇鍗曚釜鍙傛暟
+ 寰�鏉ュ叧绯昏幏鍙栧崟涓弬鏁�
</summary>
</member>
<member name="T:Admin.NET.Application.BaseCustomerOutput">
<summary>
- 瀹㈡埛妗ｆ杈撳嚭鍙傛暟
+ 寰�鏉ュ叧绯昏緭鍑哄弬鏁�
</summary>
</member>
<member name="P:Admin.NET.Application.BaseCustomerOutput.CustCode">
@@ -15745,9 +15735,9 @@
鎺у埗灞炴�ц鍒欐槑缁嗘煡璇㈠弬鏁�
</summary>
</member>
- <member name="P:Admin.NET.Application.WmsControlRuleDetailSearch.ControlRuleId">
+ <member name="P:Admin.NET.Application.WmsControlRuleDetailSearch.RuleCode">
<summary>
- 鎺у埗灞炴�ц鍒橧D
+ 鎺у埗灞炴�ц鍒欑紪鍙�
</summary>
</member>
<member name="P:Admin.NET.Application.WmsControlRuleDetailSearch.MaxImumqty">
@@ -15815,9 +15805,9 @@
鎺у埗灞炴�ц鍒欐槑缁嗕笉鍒嗛〉鏌ヨ鍙傛暟
</summary>
</member>
- <member name="P:Admin.NET.Application.WmsControlRuleDetailSearchNonPage.ControlRuleId">
+ <member name="P:Admin.NET.Application.WmsControlRuleDetailSearchNonPage.RuleCode">
<summary>
- 鎺у埗灞炴�ц鍒橧D
+ 鎺у埗灞炴�ц鍒欑紪鍙�
</summary>
</member>
<member name="P:Admin.NET.Application.WmsControlRuleDetailSearchNonPage.MaxImumqty">
@@ -15885,9 +15875,9 @@
鎺у埗灞炴�ц鍒欐槑缁嗚緭鍏ュ弬鏁�
</summary>
</member>
- <member name="P:Admin.NET.Application.WmsControlRuleDetailInput.ControlRuleId">
+ <member name="P:Admin.NET.Application.WmsControlRuleDetailInput.RuleCode">
<summary>
- 鎺у埗灞炴�ц鍒橧D
+ 鎺у埗灞炴�ц鍒欑紪鍙�
</summary>
</member>
<member name="P:Admin.NET.Application.WmsControlRuleDetailInput.MaxImumqty">
@@ -15960,9 +15950,9 @@
鎺у埗灞炴�ц鍒欐槑缁嗚緭鍑哄弬鏁�
</summary>
</member>
- <member name="P:Admin.NET.Application.WmsControlRuleDetailOutput.ControlRuleId">
+ <member name="P:Admin.NET.Application.WmsControlRuleDetailOutput.RuleCode">
<summary>
- 鎺у埗灞炴�ц鍒橧D
+ 鎺у埗灞炴�ц鍒欑紪鍙�
</summary>
</member>
<member name="P:Admin.NET.Application.WmsControlRuleDetailOutput.MaxImumqty">
@@ -16115,287 +16105,6 @@
<returns></returns>
</member>
<member name="M:Admin.NET.Application.WmsControlRuleDetailService.CheckExisitForImport(System.Collections.Generic.List{Admin.NET.Core.WmsControlRuleDetail})">
- <summary>
- 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-瀵煎叆鏃堕獙璇�
- </summary>
- <param name="inputs"></param>
- <returns></returns>
- </member>
- <member name="T:Admin.NET.Application.WmsControlRuleSearch">
- <summary>
- 鎺у埗灞炴�ц鍒欐煡璇㈠弬鏁�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearch.RuleCode">
- <summary>
- 瑙勫垯缂栧彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearch.RuleName">
- <summary>
- 瑙勫垯鍚嶇О
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearch.RuleDesc">
- <summary>
- 瑙勫垯鎻忚堪
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearch.IsDisabled">
- <summary>
- 鏄惁绂佺敤
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearch.CreatedTime">
- <summary>
- 鍒涘缓鏃堕棿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearch.UpdatedTime">
- <summary>
- 鏇存柊鏃堕棿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearch.CreatedUserName">
- <summary>
- 鍒涘缓鑰呭悕绉�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearch.UpdatedUserName">
- <summary>
- 淇敼鑰呭悕绉�
- </summary>
- </member>
- <member name="T:Admin.NET.Application.WmsControlRuleSearchNonPage">
- <summary>
- 鎺у埗灞炴�ц鍒欎笉鍒嗛〉鏌ヨ鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.RuleCode">
- <summary>
- 瑙勫垯缂栧彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.RuleName">
- <summary>
- 瑙勫垯鍚嶇О
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.RuleDesc">
- <summary>
- 瑙勫垯鎻忚堪
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.IsDisabled">
- <summary>
- 鏄惁绂佺敤
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.CreatedTime">
- <summary>
- 鍒涘缓鏃堕棿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.UpdatedTime">
- <summary>
- 鏇存柊鏃堕棿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.CreatedUserName">
- <summary>
- 鍒涘缓鑰呭悕绉�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.UpdatedUserName">
- <summary>
- 淇敼鑰呭悕绉�
- </summary>
- </member>
- <member name="T:Admin.NET.Application.WmsControlRuleInput">
- <summary>
- 鎺у埗灞炴�ц鍒欒緭鍏ュ弬鏁�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleInput.RuleCode">
- <summary>
- 瑙勫垯缂栧彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleInput.RuleName">
- <summary>
- 瑙勫垯鍚嶇О
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleInput.RuleDesc">
- <summary>
- 瑙勫垯鎻忚堪
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleInput.IsDisabled">
- <summary>
- 鏄惁绂佺敤
- </summary>
- </member>
- <member name="T:Admin.NET.Application.AddWmsControlRuleInput">
- <summary>
- 鎺у埗灞炴�ц鍒欐柊澧炲弬鏁�
- </summary>
- </member>
- <member name="T:Admin.NET.Application.DeleteWmsControlRuleInput">
- <summary>
- 鎺у埗灞炴�ц鍒欏垹闄ゅ弬鏁�
- </summary>
- </member>
- <member name="T:Admin.NET.Application.UpdateWmsControlRuleInput">
- <summary>
- 鎺у埗灞炴�ц鍒欐洿鏂板弬鏁�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.UpdateWmsControlRuleInput.Id">
- <summary>
- Id涓婚敭
- </summary>
- </member>
- <member name="T:Admin.NET.Application.QueryeWmsControlRuleInput">
- <summary>
- 鎺у埗灞炴�ц鍒欒幏鍙栧崟涓弬鏁�
- </summary>
- </member>
- <member name="T:Admin.NET.Application.WmsControlRuleOutput">
- <summary>
- 鎺у埗灞炴�ц鍒欒緭鍑哄弬鏁�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleOutput.RuleCode">
- <summary>
- 瑙勫垯缂栧彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleOutput.RuleName">
- <summary>
- 瑙勫垯鍚嶇О
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleOutput.RuleDesc">
- <summary>
- 瑙勫垯鎻忚堪
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleOutput.IsDisabled">
- <summary>
- 鏄惁绂佺敤
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleOutput.Id">
- <summary>
- Id涓婚敭
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleOutput.CreatedTime">
- <summary>
- 鍒涘缓鏃堕棿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleOutput.UpdatedTime">
- <summary>
- 鏇存柊鏃堕棿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleOutput.CreatedUserName">
- <summary>
- 鍒涘缓鑰呭悕绉�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsControlRuleOutput.UpdatedUserName">
- <summary>
- 淇敼鑰呭悕绉�
- </summary>
- </member>
- <member name="T:Admin.NET.Application.WmsControlRuleService">
- <summary>
- 鎺у埗灞炴�ц鍒欐湇鍔�
- </summary>
- </member>
- <member name="M:Admin.NET.Application.WmsControlRuleService.Page(Admin.NET.Application.WmsControlRuleSearch)">
- <summary>
- 鍒嗛〉鏌ヨ鎺у埗灞炴�ц鍒�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsControlRuleService.ListNonPageAsync(Admin.NET.Application.WmsControlRuleSearchNonPage)">
- <summary>
- 涓嶅垎椤垫煡璇㈡帶鍒跺睘鎬ц鍒欏垪琛�
- </summary>
- <param name="input">鎺у埗灞炴�ц鍒欐煡璇㈠弬鏁�</param>
- <returns>(鎺у埗灞炴�ц鍒�)瀹炰緥鍒楄〃</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsControlRuleService.Get(Admin.NET.Application.QueryeWmsControlRuleInput)">
- <summary>
- 鑾峰彇鎺у埗灞炴�ц鍒�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsControlRuleService.List(Admin.NET.Application.WmsControlRuleInput)">
- <summary>
- 鑾峰彇鎺у埗灞炴�ц鍒欏垪琛�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsControlRuleService.Add(Admin.NET.Application.AddWmsControlRuleInput)">
- <summary>
- 澧炲姞鎺у埗灞炴�ц鍒�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsControlRuleService.Delete(Admin.NET.Application.DeleteWmsControlRuleInput)">
- <summary>
- 鍒犻櫎鎺у埗灞炴�ц鍒�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsControlRuleService.Update(Admin.NET.Application.UpdateWmsControlRuleInput)">
- <summary>
- 鏇存柊鎺у埗灞炴�ц鍒�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsControlRuleService.ImportExcelAsync(Microsoft.AspNetCore.Http.IFormFile)">
- <summary>
- Excel妯℃澘瀵煎叆鎺у埗灞炴�ц鍒欏姛鑳�
- </summary>
- <param name="file">Excel妯℃澘鏂囦欢</param>
- <returns>瀵煎叆鐨勮褰曟暟</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsControlRuleService.CommonImport(System.Data.DataTable,System.Int32)">
- <summary>
- DataTable杞崲瀹炰綋瀵硅薄鍒楄〃
- </summary>
- <param name="dataTable"></param>
- <param name="dataStartLine">妯＄増鍒楀悕寮�濮嬭</param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsControlRuleService.DownloadExcelTemplate(System.String)">
- <summary>
- 鏍规嵁鐗堟湰涓嬭浇鎺у埗灞炴�ц鍒欑殑Excel瀵煎叆妯℃澘
- </summary>
- <param name="version">妯℃澘鐗堟湰</param>
- <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsControlRuleService.CheckExisit(Admin.NET.Core.WmsControlRule,System.Boolean)">
- <summary>
- 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-鏁版嵁搴�
- </summary>
- <param name="input"></param>
- <param name="isEdit"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsControlRuleService.CheckExisitForImport(System.Collections.Generic.List{Admin.NET.Core.WmsControlRule})">
<summary>
鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-瀵煎叆鏃堕獙璇�
</summary>
@@ -16972,6 +16681,14 @@
</summary>
<param name="input"></param>
<returns></returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsMaterialCustomerService.AddRange(System.Collections.Generic.List{Admin.NET.Application.AddWmsMaterialCustomerInput})">
+ <summary>
+ 鎵归噺澧炲姞鐗╂枡瀹㈡埛鍏宠仈淇℃伅
+ </summary>
+ <param name="input"></param>
+ <returns></returns>
+ <exception cref="T:System.NotImplementedException"></exception>
</member>
<member name="M:Admin.NET.Application.WmsMaterialCustomerService.Delete(Admin.NET.Application.DeleteWmsMaterialCustomerInput)">
<summary>
@@ -17695,6 +17412,16 @@
Id涓婚敭
</summary>
</member>
+ <member name="T:Admin.NET.Application.UpdateWmsMaterialInfoInput">
+ <summary>
+ 缂栬緫鐗╂枡涓氬姟淇℃伅瀹炰綋鍏ュ弬--鍖呭惈鐗╂枡銆佺墿鏂欏鎴峰叧绯汇�佹帶鍒跺睘鎬с�佹浛浠ｅ搧
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.UpdateWmsMaterialInfoInput.Id">
+ <summary>
+ Id涓婚敭
+ </summary>
+ </member>
<member name="T:Admin.NET.Application.QueryeWmsMaterialInput">
<summary>
鐗╂枡淇℃伅琛ㄨ幏鍙栧崟涓弬鏁�
@@ -17722,7 +17449,7 @@
</member>
<member name="P:Admin.NET.Application.AddWmsMaterialInfoInput.BaseCustomerList">
<summary>
- 瀹㈡埛妗ｆ
+ 寰�鏉ュ叧绯�
</summary>
</member>
<member name="T:Admin.NET.Application.WmsMaterialOutput">
@@ -17867,28 +17594,28 @@
</member>
<member name="M:Admin.NET.Application.WmsMaterialService.Page(Admin.NET.Application.WmsMaterialSearch)">
<summary>
- 鍒嗛〉鏌ヨ鐗╂枡淇℃伅琛�
+ 鍒嗛〉鏌ヨ鐗╂枡淇℃伅
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Admin.NET.Application.WmsMaterialService.ListNonPageAsync(Admin.NET.Application.WmsMaterialSearchNonPage)">
<summary>
- 涓嶅垎椤垫煡璇㈢墿鏂欎俊鎭〃鍒楄〃
+ 涓嶅垎椤垫煡璇㈢墿鏂欎俊鎭垪琛�
</summary>
- <param name="input">鐗╂枡淇℃伅琛ㄦ煡璇㈠弬鏁�</param>
- <returns>(鐗╂枡淇℃伅琛�)瀹炰緥鍒楄〃</returns>
+ <param name="input">鐗╂枡淇℃伅鏌ヨ鍙傛暟</param>
+ <returns>(鐗╂枡淇℃伅)瀹炰緥鍒楄〃</returns>
</member>
<member name="M:Admin.NET.Application.WmsMaterialService.Get(Admin.NET.Application.QueryeWmsMaterialInput)">
<summary>
- 鑾峰彇鐗╂枡淇℃伅琛�
+ 鑾峰彇鐗╂枡淇℃伅
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Admin.NET.Application.WmsMaterialService.List(Admin.NET.Application.WmsMaterialInput)">
<summary>
- 鑾峰彇鐗╂枡淇℃伅琛ㄥ垪琛�
+ 鑾峰彇鐗╂枡淇℃伅鍒楄〃
</summary>
<param name="input"></param>
<returns></returns>
@@ -17902,21 +17629,21 @@
</member>
<member name="M:Admin.NET.Application.WmsMaterialService.Delete(Admin.NET.Application.DeleteWmsMaterialInput)">
<summary>
- 鍒犻櫎鐗╂枡淇℃伅琛�
+ 鍒犻櫎鐗╂枡淇℃伅
</summary>
<param name="input"></param>
<returns></returns>
</member>
- <member name="M:Admin.NET.Application.WmsMaterialService.Update(Admin.NET.Application.UpdateWmsMaterialInput)">
+ <member name="M:Admin.NET.Application.WmsMaterialService.Update(Admin.NET.Application.UpdateWmsMaterialInfoInput)">
<summary>
- 鏇存柊鐗╂枡淇℃伅琛�
+ 鏇存柊鐗╂枡淇℃伅
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Admin.NET.Application.WmsMaterialService.ImportExcelAsync(Microsoft.AspNetCore.Http.IFormFile)">
<summary>
- Excel妯℃澘瀵煎叆鐗╂枡淇℃伅琛ㄥ姛鑳�
+ Excel妯℃澘瀵煎叆鐗╂枡淇℃伅鍔熻兘
</summary>
<param name="file">Excel妯℃澘鏂囦欢</param>
<returns>瀵煎叆鐨勮褰曟暟</returns>
@@ -17931,7 +17658,7 @@
</member>
<member name="M:Admin.NET.Application.WmsMaterialService.DownloadExcelTemplate(System.String)">
<summary>
- 鏍规嵁鐗堟湰涓嬭浇鐗╂枡淇℃伅琛ㄧ殑Excel瀵煎叆妯℃澘
+ 鏍规嵁鐗堟湰涓嬭浇鐗╂枡淇℃伅鐨凟xcel瀵煎叆妯℃澘
</summary>
<param name="version">妯℃澘鐗堟湰</param>
<returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
@@ -17989,46 +17716,6 @@
<member name="P:Admin.NET.Application.WmsPlaceSearch.PlaceStatus">
<summary>
搴撲綅灞炴��
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearch.IsSrmPlace">
- <summary>
- 鏄惁鍫嗗灈鏈哄簱浣�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearch.SrmPlaceNo">
- <summary>
- 鍫嗗灈鏈哄簱浣嶅彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearch.IsRgvPlace">
- <summary>
- 鏄惁RGV搴撲綅
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearch.RgvPlaceNo">
- <summary>
- RGV搴撲綅鍙�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearch.IsAgvPlace">
- <summary>
- 鏄惁AGV搴撲綅
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearch.AgvPlaceNo">
- <summary>
- AGV搴撲綅鍙�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearch.IsTransPlace">
- <summary>
- 鏄惁杈撻�佺嚎搴撲綅
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearch.TransPlaceNo">
- <summary>
- 杈撻�佺嚎搴撲綅鍙�
</summary>
</member>
<member name="P:Admin.NET.Application.WmsPlaceSearch.IsActivateWCS">
@@ -18196,46 +17883,6 @@
搴撲綅灞炴��
</summary>
</member>
- <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.IsSrmPlace">
- <summary>
- 鏄惁鍫嗗灈鏈哄簱浣�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.SrmPlaceNo">
- <summary>
- 鍫嗗灈鏈哄簱浣嶅彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.IsRgvPlace">
- <summary>
- 鏄惁RGV搴撲綅
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.RgvPlaceNo">
- <summary>
- RGV搴撲綅鍙�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.IsAgvPlace">
- <summary>
- 鏄惁AGV搴撲綅
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.AgvPlaceNo">
- <summary>
- AGV搴撲綅鍙�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.IsTransPlace">
- <summary>
- 鏄惁杈撻�佺嚎搴撲綅
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.TransPlaceNo">
- <summary>
- 杈撻�佺嚎搴撲綅鍙�
- </summary>
- </member>
<member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.IsActivateWCS">
<summary>
鏄惁婵�娲讳笌浠诲姟璋冨害
@@ -18391,54 +18038,9 @@
搴撲綅绫诲瀷鍚嶇О
</summary>
</member>
- <member name="P:Admin.NET.Application.WmsPlaceInput.StockUnit">
- <summary>
- 瀛樻斁鍗曚綅
- </summary>
- </member>
<member name="P:Admin.NET.Application.WmsPlaceInput.PlaceStatus">
<summary>
搴撲綅灞炴��
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceInput.IsSrmPlace">
- <summary>
- 鏄惁鍫嗗灈鏈哄簱浣�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceInput.SrmPlaceNo">
- <summary>
- 鍫嗗灈鏈哄簱浣嶅彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceInput.IsRgvPlace">
- <summary>
- 鏄惁RGV搴撲綅
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceInput.RgvPlaceNo">
- <summary>
- RGV搴撲綅鍙�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceInput.IsAgvPlace">
- <summary>
- 鏄惁AGV搴撲綅
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceInput.AgvPlaceNo">
- <summary>
- AGV搴撲綅鍙�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceInput.IsTransPlace">
- <summary>
- 鏄惁杈撻�佺嚎搴撲綅
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsPlaceInput.TransPlaceNo">
- <summary>
- 杈撻�佺嚎搴撲綅鍙�
</summary>
</member>
<member name="P:Admin.NET.Application.WmsPlaceInput.IsActivateWCS">
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs
index 3b5aef6..52f7a80 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs
@@ -146,6 +146,10 @@
if (codeGenConfig.WhetherRequired == YesOrNot.Y.ToString())
{//蹇呭～瀛楁蹇呴』閰嶇疆澧炴敼銆�
codeGenConfig.WhetherAddUpdate = YesOrNot.Y.ToString();
+ if (codeGenConfig.ColumnName.ToLower() == "id")
+ {
+ codeGenConfig.WhetherAddUpdate = YesOrNot.N.ToString();
+ }
}
codeGenConfig.WhetherTable = YesOrNo;
--
Gitblit v1.9.3