From fcb256242c3f337976e6f5b7f8299fddfb52efd0 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周二, 23 4月 2024 15:33:50 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Map/WmsMaterialMapper.cs | 18
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/addForm.vue | 145 ++
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/excelForm.vue | 181 +++
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/editForm.vue | 179 +++
iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsMaterialManage.js | 114 ++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml | 621 ++++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs | 420 +++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/IWmsMaterialService.cs | 22
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm | 29
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue | 886 +++++++++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsMaterialImport.xlsx | 0
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs | 637 +++++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs | 142 ++
13 files changed, 3,375 insertions(+), 19 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsMaterialManage.js b/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsMaterialManage.js
new file mode 100644
index 0000000..a1e6aae
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsMaterialManage.js
@@ -0,0 +1,114 @@
+锘縤mport { axios } from '@/utils/request'
+
+/**
+ * 鏌ヨ鐗╂枡淇℃伅琛�
+ *
+ * @author ly
+ */
+export function WmsMaterialPage (parameter) {
+ return axios({
+ url: '/WmsMaterial/page',
+ method: 'get',
+ params: parameter
+ })
+}
+
+/**
+ * 鐗╂枡淇℃伅琛ㄥ垪琛�
+ *
+ * @author ly
+ */
+export function WmsMaterialList (parameter) {
+ return axios({
+ url: '/WmsMaterial/list',
+ method: 'get',
+ params: parameter
+ })
+}
+
+/**
+ * 娣诲姞鐗╂枡淇℃伅琛�
+ *
+ * @author ly
+ */
+export function WmsMaterialAdd (parameter) {
+ return axios({
+ url: '/WmsMaterial/add',
+ method: 'post',
+ data: parameter
+ })
+}
+
+/**
+ * 缂栬緫鐗╂枡淇℃伅琛�
+ *
+ * @author ly
+ */
+export function WmsMaterialEdit (parameter) {
+ return axios({
+ url: '/WmsMaterial/edit',
+ method: 'post',
+ data: parameter
+ })
+}
+
+/**
+ * 鍒犻櫎鐗╂枡淇℃伅琛�
+ *
+ * @author ly
+ */
+export function WmsMaterialDelete (parameter) {
+ return axios({
+ url: '/WmsMaterial/delete',
+ method: 'post',
+ data: parameter
+ })
+}
+
+
+/**
+ * 瀵煎嚭鐗╂枡淇℃伅琛ㄧ殑Excel鏂囦欢
+ *
+ * @author ly
+ */
+export function WmsMaterialToExcel (parameter) {
+ return axios({
+ url: '/WmsMaterial/toExcel',
+ method: 'get',
+ params: parameter,
+ responseType: 'blob'
+ })
+}
+
+/**
+ * 瀵煎叆鐗╂枡淇℃伅琛ㄧ殑Excel鏂囦欢
+ *
+ * @author ly
+ */
+export function WmsMaterialImportExcel (data, parameter) {
+ return axios({
+ url: '/WmsMaterial/importExcel',
+ method: 'post',
+ data: data,
+ params: parameter
+
+ })
+}
+
+
+/**
+ * 涓嬭浇鐗╂枡淇℃伅琛ㄧ殑Excel瀵煎叆妯℃澘
+ *
+ * @author ly
+ */
+export function WmsMaterialDownloadExcelTemplate(parameter) {
+ return axios({
+ url: '/WmsMaterial/downloadExcelTemplate',
+ method: 'get',
+ params: parameter,
+ responseType: 'blob'
+ })
+}
+
+
+
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/addForm.vue
new file mode 100644
index 0000000..e8b8fbb
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/addForm.vue
@@ -0,0 +1,145 @@
+锘�<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="['materialName', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉帮紒'}]}]" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" v-decorator="['materialCode', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑紪鍙凤紒'}]}]" />
+ </a-form-item>
+ <a-form-item label="ERP缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏RP缂栧彿" v-decorator="['erpCode']" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�" v-decorator="['materialTypeName']" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡绫诲瀷鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬫弿杩�" v-decorator="['materialTypeDescr']" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input-number placeholder="璇疯緭鍏ョ墿鏂欑被鍨�" style="width: 100%" v-decorator="['materialType']" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡缁�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑粍" v-decorator="['materialGroup']" />
+ </a-form-item>
+ <a-form-item label="ABC鍒嗙被鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏BC鍒嗙被鍚嶇О" v-decorator="['aBCClassName']" />
+ </a-form-item>
+ <a-form-item label="ABC鍒嗙被" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input-number placeholder="璇疯緭鍏BC鍒嗙被" style="width: 100%" v-decorator="['aBCClass']" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡瑙勬牸" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欒鏍�" v-decorator="['materialSpec']" />
+ </a-form-item>
+ <a-form-item label="榛樿鍏ュ簱搴撲綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ラ粯璁ゅ叆搴撳簱浣�" v-decorator="['inPlaceCode']" />
+ </a-form-item>
+ <a-form-item label="搴撳瓨鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ュ簱瀛樺崟浣�" v-decorator="['materialUnit']" />
+ </a-form-item>
+ <a-form-item label="閲囪喘鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ラ噰璐崟浣�" v-decorator="['pOUnit']" />
+ </a-form-item>
+ <a-form-item label="棰滆壊" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ラ鑹�" v-decorator="['color']" />
+ </a-form-item>
+ <a-form-item label="閲嶉噺" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ラ噸閲�" v-decorator="['weight']" />
+ </a-form-item>
+ <a-form-item label="鏍囧寘鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ爣鍖呮暟閲�" v-decorator="['sNP']" />
+ </a-form-item>
+ <a-form-item label="鎹㈢畻鐜�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ崲绠楃巼" v-decorator="['translateRate']" />
+ </a-form-item>
+ <a-form-item label="鎵规灞炴�ц鍒�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ壒娆″睘鎬ц鍒�" v-decorator="['batchRuleId']" />
+ </a-form-item>
+ <a-form-item label="鎺у埗灞炴�ц鍒�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒�" v-decorator="['controlRuleId']" />
+ </a-form-item>
+ <a-form-item label="鏄惁绂佺敤" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
+ </a-form-item>
+ <a-form-item label="鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ弿杩�" v-decorator="['materialDesc']" />
+ </a-form-item>
+ </a-form>
+ </a-spin>
+ </a-modal>
+</template>
+
+<script>
+ import moment from 'moment'
+ import {
+ WmsMaterialAdd
+ } from '@/api/modular/main/WmsBase/WmsMaterialManage'
+ export default {
+ data () {
+ return {
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 15 }
+ },
+ visible: false,
+ confirmLoading: false,
+ form: this.$form.createForm(this)
+ }
+ },
+ methods: {
+ moment,
+ // 鍒濆鍖栨柟娉�
+ add (record) {
+ this.visible = true
+ this.$nextTick(() => {
+
+ });
+ },
+ /**
+ * 鎻愪氦琛ㄥ崟
+ */
+ handleSubmit () {
+ const { form: { validateFields } } = this
+ this.confirmLoading = true
+ validateFields((errors, values) => {
+ if (!errors) {
+ for (const key in values) {
+ if (typeof (values[key]) === 'object') {
+ values[key] = JSON.stringify(values[key])
+ }
+ }
+ WmsMaterialAdd(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/WmsBase/WmsMaterial/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/editForm.vue
new file mode 100644
index 0000000..b3d8ee6
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/editForm.vue
@@ -0,0 +1,179 @@
+锘�<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="['materialName', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉帮紒'}]}]" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" v-decorator="['materialCode', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑紪鍙凤紒'}]}]" />
+ </a-form-item>
+ <a-form-item label="ERP缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏RP缂栧彿" v-decorator="['erpCode']" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�" v-decorator="['materialTypeName']" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡绫诲瀷鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬫弿杩�" v-decorator="['materialTypeDescr']" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input-number placeholder="璇疯緭鍏ョ墿鏂欑被鍨�" style="width: 100%" v-decorator="['materialType']" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡缁�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑粍" v-decorator="['materialGroup']" />
+ </a-form-item>
+ <a-form-item label="ABC鍒嗙被鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏BC鍒嗙被鍚嶇О" v-decorator="['aBCClassName']" />
+ </a-form-item>
+ <a-form-item label="ABC鍒嗙被" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input-number placeholder="璇疯緭鍏BC鍒嗙被" style="width: 100%" v-decorator="['aBCClass']" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡瑙勬牸" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欒鏍�" v-decorator="['materialSpec']" />
+ </a-form-item>
+ <a-form-item label="榛樿鍏ュ簱搴撲綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ラ粯璁ゅ叆搴撳簱浣�" v-decorator="['inPlaceCode']" />
+ </a-form-item>
+ <a-form-item label="搴撳瓨鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ュ簱瀛樺崟浣�" v-decorator="['materialUnit']" />
+ </a-form-item>
+ <a-form-item label="閲囪喘鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ラ噰璐崟浣�" v-decorator="['pOUnit']" />
+ </a-form-item>
+ <a-form-item label="棰滆壊" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ラ鑹�" v-decorator="['color']" />
+ </a-form-item>
+ <a-form-item label="閲嶉噺" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ラ噸閲�" v-decorator="['weight']" />
+ </a-form-item>
+ <a-form-item label="鏍囧寘鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ爣鍖呮暟閲�" v-decorator="['sNP']" />
+ </a-form-item>
+ <a-form-item label="鎹㈢畻鐜�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ崲绠楃巼" v-decorator="['translateRate']" />
+ </a-form-item>
+ <a-form-item label="鎵规灞炴�ц鍒�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ壒娆″睘鎬ц鍒�" v-decorator="['batchRuleId']" />
+ </a-form-item>
+ <a-form-item label="鎺у埗灞炴�ц鍒�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒�" v-decorator="['controlRuleId']" />
+ </a-form-item>
+ <a-form-item label="鏄惁绂佺敤" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
+ </a-form-item>
+ <a-form-item label="鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ弿杩�" v-decorator="['materialDesc']" />
+ </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 moment from 'moment'
+ import {
+ WmsMaterialEdit
+ } from '@/api/modular/main/WmsBase/WmsMaterialManage'
+ export default {
+ data () {
+ return {
+ Id: 0,
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 15 }
+ },
+ record: {},
+ visible: false,
+ confirmLoading: false,
+ form: this.$form.createForm(this)
+ }
+ },
+ methods: {
+ moment,
+ // 鍒濆鍖栨柟娉�
+ edit (record) {
+ this.visible = true;
+ this.Id = record.id;
+ this.$nextTick(() => {
+ });
+ //娣卞害鎷疯礉 绉婚櫎VUE鐨勭洃鍚紝闃叉INDEX椤甸潰鍊煎彉鍔�
+ this.record = JSON.parse(JSON.stringify(record))
+ this.$nextTick(() => {
+ this.form.setFieldsValue(
+ {
+ id: record.id,
+ materialName: record.materialName,
+ materialCode: record.materialCode,
+ erpCode: record.erpCode,
+ materialTypeName: record.materialTypeName,
+ materialTypeDescr: record.materialTypeDescr,
+ materialType: record.materialType,
+ materialGroup: record.materialGroup,
+ aBCClassName: record.aBCClassName,
+ aBCClass: record.aBCClass,
+ materialSpec: record.materialSpec,
+ inPlaceCode: record.inPlaceCode,
+ materialUnit: record.materialUnit,
+ pOUnit: record.pOUnit,
+ color: record.color,
+ weight: record.weight,
+ sNP: record.sNP,
+ translateRate: record.translateRate,
+ batchRuleId: record.batchRuleId,
+ controlRuleId: record.controlRuleId,
+ isDisabled: record.isDisabled,
+ materialDesc: record.materialDesc
+ }
+ )
+ })
+ },
+ 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]
+ }
+ }
+ WmsMaterialEdit(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/WmsBase/WmsMaterial/excelForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/excelForm.vue
new file mode 100644
index 0000000..d3ea5d0
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/excelForm.vue
@@ -0,0 +1,181 @@
+锘�<template>
+ <a-modal
+ :width="850"
+ :destroyOnClose="true"
+ :visible="visible"
+ :forceRender="true"
+ title="鎵归噺瀵煎叆"
+ cancelText="鍙栨秷涓婁紶"
+ okText="寮�濮嬩笂浼�"
+ @cancel="handleCancel"
+ @ok="handleSubmit">
+ <a-spin :spinning="confirmLoading">
+ <a-row :span="24">
+ <span>璇烽�夋嫨瑕佸鍏ョ殑鏁版嵁鏂囦欢锛圗xcel鏍煎紡锛�</span>
+ </a-row>
+ <p></p>
+ <a-row>
+ <a-col :span="16">
+ <a-upload-dragger accept=".xlsx,.xls" :multiple="false" :customRequest="customRequest" @change="handleChange" :beforeUpload="beforeUpload">
+ <a-icon style="font-size: 40px;" type="cloud-upload" />
+ </a-upload-dragger>
+ </a-col>
+ <!--<a-col :span="8">
+ <span>瀵煎叆妯″紡锛�</span>
+ <a-select
+ style="width: 130px"
+ placeholder="璇烽�夋嫨瀵煎叆妯″紡"
+ v-model="importExcelType">
+ <a-select-option
+ v-for="(item,index) in importExcelTypeData"
+ :key="index"
+ :value="item.code">{{ item.name }}
+ </a-select-option>
+ </a-select>
+ </a-col>-->
+ </a-row>
+ <a-row :span="24">
+ <!--<a-button @click="showDemand" style="width: 150px;text-align: left;" type="link" v-show="!detailed">
+ 鐐瑰嚮鏌ョ湅鏂囦欢涓婁紶瑕佹眰
+ </a-button>-->
+ <span>銆�</span>
+ <a-button style="width: 90px;text-align: left;" @click="wmsMaterialDownloadExcelTemplate" type="link">涓嬭浇瀵煎叆妯℃澘</a-button>锛屽～鍐欏苟涓婁紶
+ <span>銆�</span>
+ <a-button @click="showDemand" style="width: 150px;text-align: left;" type="link" v-show="detailed">
+ 鏀惰捣
+ </a-button>
+ </a-row>
+ <a-row v-show="detailed" style="background: #fef4e8; height: 30px;" :span="24">
+ <a-breadcrumb>
+ <a-breadcrumb-item style="line-height: 30px;color: #faad14;margin-left: 18px;">鏂囦欢涓婁紶瑕佹眰</a-breadcrumb-item>
+ </a-breadcrumb>
+ </a-row>
+ <pre v-show="detailed">
+ <div v-html="demandText"></div>
+ </pre>
+ <a-table v-show="detailed" :columns="columns" :data-source="dataList" :rowKey="(record) => record.processID" :pagination="false"></a-table>
+ <pre v-show="detailed">
+ <div v-html="columnText"></div>
+ </pre>
+ </a-spin>
+ </a-modal>
+</template>
+
+<script>
+ import { downloadFile, checkFile, parseExcelFieldText, parseDemandText } from '@/utils/util'
+
+ import { WmsMaterialImportExcel, WmsMaterialDownloadExcelTemplate} from '@/api/modular/main/WmsBase/WmsMaterialManage'
+ import { sysExcelTemplateGetColumnList } from '@/api/modular/system/excelTemplateManage'
+ export default {
+ components: {
+ },
+ data() {
+ return {
+ visible: false,
+ detailed: false,
+ confirmLoading: false,
+ fileList: [],
+ importExcelTypeData: [],
+ importExcelType: '1',
+ uploadFile: null,
+ columns: [],
+ dataList: [],
+ demandText:'',
+ columnText: ''
+ }
+ },
+ methods: {
+ index() {
+ this.visible = true;
+ this.importExcelTypeData = this.$options.filters['dictData']('import_excel_type')
+ this.demandText = parseDemandText("wmsMaterialDownloadExcelTemplate")
+ window.downloadFile = this.wmsMaterialDownloadExcelTemplate;
+ this.getTable();
+ },
+ showDemand() {
+ this.detailed = !this.detailed;
+ },
+ customRequest(document) {
+ this.uploadFile = document
+ },
+ getTable() {
+ sysExcelTemplateGetColumnList({className: "WmsMaterial"}).then(res =>
+ {
+ if (res.success) {
+ this.columns =[];
+ this.dataList = [{}];
+ res.data.forEach(x => {
+ this.columns.push({
+ dataIndex: x.columnName,
+ key: x.columnName,
+ title: x.columnComment
+ });
+ this.dataList[0][x.columnName] = x.isRequired ? "蹇呭～" : "闈炲繀濉�"
+ });
+ this.columnText = parseExcelFieldText(res.data);
+ }
+ });
+ },
+ beforeUpload(fileInfo) {
+ let res = checkFile(fileInfo, 1073741824, ['.xlsx', '.xls']);
+ if (!res.success) {
+ this.$message.warning(res.msg)
+ return false
+ }
+ setTimeout(() => {this.uploadFile.onSuccess(this.uploadFile.file)}, 1000)
+ },
+ handleChange(fileInfo) {
+ if (fileInfo.file.status === 'error') {
+ fileInfo.fileList.splice(0, 1)
+ }
+ if (fileInfo.file.status === 'done') {
+ if (fileInfo.fileList.length > 1) {
+ fileInfo.fileList.splice(0, 1)
+ }
+ this.fileList = fileInfo.file
+ }
+ },
+ handleSubmit() {
+ this.confirmLoading = true
+ const formData = new FormData()
+ formData.append('file', this.uploadFile.file)
+ WmsMaterialImportExcel(formData, {importExcelType: this.importExcelType}).then(res => {
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.confirmLoading = false
+ this.$emit('ok', [])
+ this.handleCancel()
+ }).finally((res)=>{this.confirmLoading = false})
+ },
+ handleCancel() {
+ this.visible = false
+ this.detailed = false
+ },
+ wmsMaterialDownloadExcelTemplate() {
+ WmsMaterialDownloadExcelTemplate({version: "v2"}).then((res) => {
+ downloadFile(res);
+ }).catch((err) => {
+ this.$message.error('涓嬭浇閿欒锛氳幏鍙栨枃浠舵祦閿欒' + err)
+ })
+ }
+ }
+ }
+</script>
+
+<style scoped>
+::v-deep .ant-upload.ant-upload-drag {
+ position: relative;
+ width: 140px;
+ height: 135px;
+ text-align: center;
+ background: #fafafa;
+ border: 1px dashed #d9d9d9;
+ border-radius: 2px;
+ cursor: pointer;
+ -webkit-transition: border-color 0.3s;
+ transition: border-color 0.3s;
+}
+::v-deep .ant-btn:focus:not(.ant-btn-primary):not(.ant-btn-danger), .ant-btn:hover:not(.ant-btn-primary):not(.ant-btn-danger) {
+ color: #ffc53d;
+ border-color: white;
+}
+</style>
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
new file mode 100644
index 0000000..3744a08
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -0,0 +1,886 @@
+锘�<template>
+ <div ref="boxOutWrap" class="boxOutWrap">
+ <div ref="boxForm" class="boxForm">
+ <a-card :bordered="false" :bodyStyle="tstyle">
+
+ <div class="table-page-search-wrapper" v-if="hasPerm('WmsMaterial:page')">
+ <a-form layout="inline">
+ <a-row :gutter="48">
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鐗╂枡鍚嶇О">
+ <a-input v-model="queryParam.materialName" allow-clear placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鐗╂枡缂栧彿">
+ <a-input v-model="queryParam.materialCode" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�"/>
+ </a-form-item>
+ </a-col><template v-if="advanced">
+ <a-col :md="8" :sm="24">
+ <a-form-item label="ERP缂栧彿">
+ <a-input v-model="queryParam.erpCode" allow-clear placeholder="璇疯緭鍏RP缂栧彿"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鐗╂枡绫诲瀷鍚嶇О">
+ <a-input v-model="queryParam.materialTypeName" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鐗╂枡绫诲瀷鎻忚堪">
+ <a-input v-model="queryParam.materialTypeDescr" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬫弿杩�"/>
+ </a-form-item>
+ </a-col><a-col :md="8" :sm="24">
+ <a-form-item label="鐗╂枡绫诲瀷">
+ <a-input-number v-model="queryParam.materialType" style="width: 100%" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑被鍨�"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鐗╂枡缁�">
+ <a-input v-model="queryParam.materialGroup" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑粍"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="ABC鍒嗙被鍚嶇О">
+ <a-input v-model="queryParam.aBCClassName" allow-clear placeholder="璇疯緭鍏BC鍒嗙被鍚嶇О"/>
+ </a-form-item>
+ </a-col><a-col :md="8" :sm="24">
+ <a-form-item label="ABC鍒嗙被">
+ <a-input-number v-model="queryParam.aBCClass" style="width: 100%" allow-clear placeholder="璇疯緭鍏BC鍒嗙被"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鐗╂枡瑙勬牸">
+ <a-input v-model="queryParam.materialSpec" allow-clear placeholder="璇疯緭鍏ョ墿鏂欒鏍�"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="榛樿鍏ュ簱搴撲綅">
+ <a-input v-model="queryParam.inPlaceCode" allow-clear placeholder="璇疯緭鍏ラ粯璁ゅ叆搴撳簱浣�"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="搴撳瓨鍗曚綅">
+ <a-input v-model="queryParam.materialUnit" allow-clear placeholder="璇疯緭鍏ュ簱瀛樺崟浣�"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="閲囪喘鍗曚綅">
+ <a-input v-model="queryParam.pOUnit" allow-clear placeholder="璇疯緭鍏ラ噰璐崟浣�"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="棰滆壊">
+ <a-input v-model="queryParam.color" allow-clear placeholder="璇疯緭鍏ラ鑹�"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="閲嶉噺">
+ <a-input v-model="queryParam.weight" allow-clear placeholder="璇疯緭鍏ラ噸閲�"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鏍囧寘鏁伴噺">
+ <a-input v-model="queryParam.sNP" allow-clear placeholder="璇疯緭鍏ユ爣鍖呮暟閲�"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鎹㈢畻鐜�">
+ <a-input v-model="queryParam.translateRate" allow-clear placeholder="璇疯緭鍏ユ崲绠楃巼"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鎵规灞炴�ц鍒�">
+ <a-input v-model="queryParam.batchRuleId" allow-clear placeholder="璇疯緭鍏ユ壒娆″睘鎬ц鍒�"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鎺у埗灞炴�ц鍒�">
+ <a-input v-model="queryParam.controlRuleId" 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.isDisabled" placeholder="璇烽�夋嫨鏄惁绂佺敤">
+ <a-select-option v-for="(item,index) in isDisabledData" :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.materialDesc" allow-clear placeholder="璇疯緭鍏ユ弿杩�"/>
+ </a-form-item>
+ </a-col> <!--骞存湀鏃ユ椂鍒嗙-->
+ <!--鏃堕棿鑼冨洿-->
+
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鍒涘缓鏃堕棿">
+ <a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']" :show-time="{
+format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.createdTime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" @change="onChangecreatedTime"/>
+
+ </a-form-item>
+ </a-col>
+ <!--骞存湀鏃ユ椂鍒嗙-->
+ <!--鏃堕棿鑼冨洿-->
+
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鏇存柊鏃堕棿">
+ <a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']" :show-time="{
+format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.updatedTime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" @change="onChangeupdatedTime"/>
+
+ </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>
+
+ <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>
+ </div>
+ <a-card :bordered="false">
+ <s-table
+ ref="table"
+ :columns="columns"
+ :data="loadData"
+ :alert="true"
+ @changeTablePage="pageInfo = $event"
+ :scroll="{x: true,y:tableHeight}"
+ :rowKey="(record) => record.id"
+ :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
+ <template class="table-operator" slot="operator" v-if="hasPerm('WmsMaterial:add')" >
+ <div ref="actionBar" class="actionBar">
+ <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
+ 瀵煎叆
+ </a-button>
+ <a-button type="info" v-if="hasPerm('WmsMaterial:exportExcel')" icon="download" @click="WmsMaterialToExcel()">
+ 瀵煎嚭
+ </a-button>
+ <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.addForm.add()">鏂板鐗╂枡淇℃伅琛�</a-button>
+ </div>
+ </template>
+ <span slot="isDisabledscopedSlots" slot-scope="text">
+ <div v-if="text===true ">
+ <a-tag color="green">鏄�</a-tag>
+ </div>
+ <div v-else-if="text==false">
+ <a-tag color="volcano">鍚�</a-tag>
+ </div>
+ <div v-else=""></div>
+ </span>
+ <span slot="action" slot-scope="text, record">
+
+ <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.editForm.edit(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>
+ </a-popconfirm>
+ </span>
+ </s-table>
+ <add-form ref="addForm" @ok="handleOk" />
+ <edit-form ref="editForm" @ok="handleOk" />
+ <excel-form ref="excelForm" @ok="handleOk" />
+ </a-card>
+ </div>
+</template>
+<script>
+ import { STable } from '@/components'
+ import moment from 'moment'
+ import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
+ //鑷畾涔塼able楂樺害
+ import setTableHtMixin from '@/mixins/handleTableHt.js'
+ import addForm from './addForm.vue'
+ import { exportExcel } from '@/utils/exportToExcel'
+ import { downloadFile } from '@/utils/util'
+ import editForm from './editForm.vue'
+ import excelForm from './excelForm.vue'
+ export default {
+ mixins: [setTableHtMixin],
+ components: {
+ STable,
+ addForm,
+ editForm,
+ excelForm
+ },
+ data () {
+ return {
+ advanced: false, // 楂樼骇鎼滅储 灞曞紑/鍏抽棴
+ queryParam: {},
+ pageInfo: {
+ current: 1,
+ pageSize: 10
+ },
+ columns: [
+ {
+ title:'搴忓彿',
+ width: '60px',
+ align: 'center',
+ customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
+ },
+ {
+ title: '鐗╂枡鍚嶇О',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'materialName'
+ },
+ {
+ title: '鐗╂枡缂栧彿',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'materialCode'
+ },
+ {
+ title: 'ERP缂栧彿',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'erpCode'
+ },
+ {
+ title: '鐗╂枡绫诲瀷鍚嶇О',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'materialTypeName'
+ },
+ {
+ title: '鐗╂枡绫诲瀷鎻忚堪',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'materialTypeDescr'
+ },
+ {
+ title: '鐗╂枡绫诲瀷',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'materialType'
+ },
+ {
+ title: '鐗╂枡缁�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'materialGroup'
+ },
+ {
+ title: 'ABC鍒嗙被鍚嶇О',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'aBCClassName'
+ },
+ {
+ title: 'ABC鍒嗙被',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'aBCClass'
+ },
+ {
+ title: '鐗╂枡瑙勬牸',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'materialSpec'
+ },
+ {
+ title: '榛樿鍏ュ簱搴撲綅',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'inPlaceCode'
+ },
+ {
+ title: '搴撳瓨鍗曚綅',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'materialUnit'
+ },
+ {
+ title: '閲囪喘鍗曚綅',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'pOUnit'
+ },
+ {
+ title: '棰滆壊',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'color'
+ },
+ {
+ title: '閲嶉噺',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'weight'
+ },
+ {
+ title: '鏍囧寘鏁伴噺',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'sNP'
+ },
+ {
+ title: '鎹㈢畻鐜�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'translateRate'
+ },
+ {
+ title: '鎵规灞炴�ц鍒�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'batchRuleId'
+ },
+ {
+ title: '鎺у埗灞炴�ц鍒�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'controlRuleId'
+ },
+ {
+ title: '鏄惁绂佺敤',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'isDisabled',
+ scopedSlots: { customRender: 'isDisabledscopedSlots' }
+ },
+ {
+ title: '鎻忚堪',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'materialDesc'
+ },
+ {
+ title: '鍒涘缓鏃堕棿',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'createdTime'
+ },
+ {
+ title: '鏇存柊鏃堕棿',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'updatedTime'
+ },
+ {
+ title: '鍒涘缓鑰呭悕绉�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'createdUserName'
+ },
+ {
+ title: '淇敼鑰呭悕绉�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'updatedUserName'
+ }
+ ],
+ tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+ // 鍔犺浇鏁版嵁鏂规硶 蹇呴』涓� Promise 瀵硅薄
+ loadData: parameter => {
+ return WmsMaterialPage(Object.assign(parameter, this.switchingDate())).then((res) => {
+ return res.data
+ })
+ },
+ selectedRowKeys: [],
+ selectedRows: []
+ }
+ },
+ created () {
+ if (this.hasPerm('WmsMaterial:edit') || this.hasPerm('WmsMaterial:delete')) {
+ this.columns.push({
+ title: '鎿嶄綔',
+ width: '150px',
+ dataIndex: 'action',
+ scopedSlots: { customRender: 'action' }
+ })
+ }
+ const path = this.$route.path
+ const columnStr = window.localStorage.getItem(path)
+ if(columnStr) {
+ var _columns = JSON.parse(columnStr)
+ this.columns.forEach(element => {
+ var fObj = _columns.find((item, index) => {
+ return item.dataIndex === element.dataIndex;
+ })
+ if(fObj!=undefined && fObj!=null){
+ element.checked=fObj.checked;
+ }
+ });
+ }
+ const isDisabledOption = this.$options
+ this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
+
+ this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
+ window.addEventListener(
+ 'resize',
+ () => {
+ this.handleTableHt() // 鐩戝惉灞忓箷澶у皬鏀瑰彉琛ㄦ牸楂樺害
+ },
+ false
+ )
+
+ },
+ methods: {
+ moment,
+ /**
+ * 鏌ヨ鍙傛暟缁勮
+ */
+ switchingDate () {
+ const obj = JSON.parse(JSON.stringify(this.queryParam))
+ return obj
+ },
+ WmsMaterialDelete (record) {
+ WmsMaterialDelete(record).then((res) => {
+ if (res.success) {
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.$refs.table.refresh()
+ } else {
+ this.$message.error('鍒犻櫎澶辫触') // + res.message
+ }
+ })
+ },
+
+
+ WmsMaterialToExcel() {
+ this.loading = true
+ let entozh = {};
+ const path = this.$route.path;
+ if (window.localStorage.getItem(path)) {
+ JSON.parse(window.localStorage.getItem(path)).forEach(item => {
+ if (item.dataIndex != 'action' && item.checked) {
+ entozh[item.dataIndex] = item.title
+ }
+ })
+ } else { //鐩存帴鐐瑰鍑�
+ this.columns.forEach(item => {
+ if (item.dataIndex != 'action') {
+ entozh[item.dataIndex] = item.title
+ }
+ })
+ }
+ WmsMaterialPage(Object.assign({ pageSize: 100000, pageIndex: 1 }, this.queryParam)).then((res) => {
+ this.loading = false;
+ //闇�瑕佹埅鍙栨棩鏈熺殑瀛楁
+ var arrDataCutout = this.columns.filter(v => v.customCutout == true);
+ res.data.rows.forEach(item => {
+ var arrKeys = Object.keys(item);
+ arrKeys.forEach(key => {
+ var strFieldDic = key + 'Data';
+ //鏋氫妇杞��
+ if (this[strFieldDic] && this[strFieldDic].length > 0) {
+ let arrFieldDic = this[strFieldDic].filter(v => String(v.code) == String(item[key]));
+ if (arrFieldDic.length > 0) {
+ item[key] = arrFieldDic[0]?.name || '娌℃湁鏋氫妇鍊�';
+ }
+ }
+ // 鏃ユ湡鎴彇
+ if (arrDataCutout.length > 0) {
+ arrDataCutout.forEach(itemIn => {
+ if (key == itemIn.dataIndex && item[key]) {
+ item[key] = item[key].split(" ")[0]
+ }
+ })
+ }
+ });
+ })
+ exportExcel(res.data.rows, entozh, "xlsx", `${this.$route.meta.title}`)
+ }).catch((err) => {
+ this.loading = false
+ this.$message.error('涓嬭浇閿欒锛氳幏鍙栨枃浠舵祦閿欒' + err)
+ })
+ },
+
+
+ toggleAdvanced () {
+ this.advanced = !this.advanced
+ this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
+ },
+ onChangecreatedTime(date, dateString) {
+ this.queryParam.createdTime = dateString
+ },
+ onChangeupdatedTime(date, dateString) {
+ this.queryParam.updatedTime = dateString
+ },
+ handleOk () {
+ this.$refs.table.refresh()
+ },
+ onSelectChange (selectedRowKeys, selectedRows) {
+ this.selectedRowKeys = selectedRowKeys
+ this.selectedRows = selectedRows
+ }
+ }
+ }
+</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 2777b13..4b99419 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
@@ -15339,6 +15339,627 @@
<param name="Aisle"></param>
<returns></returns>
</member>
+ <member name="T:Admin.NET.Application.WmsMaterialSearch">
+ <summary>
+ 鐗╂枡淇℃伅琛ㄦ煡璇㈠弬鏁�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialName">
+ <summary>
+ 鐗╂枡鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialCode">
+ <summary>
+ 鐗╂枡缂栧彿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.ErpCode">
+ <summary>
+ ERP缂栧彿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialTypeName">
+ <summary>
+ 鐗╂枡绫诲瀷鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialTypeDescr">
+ <summary>
+ 鐗╂枡绫诲瀷鎻忚堪
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialType">
+ <summary>
+ 鐗╂枡绫诲瀷
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialGroup">
+ <summary>
+ 鐗╂枡缁�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.ABCClassName">
+ <summary>
+ ABC鍒嗙被鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.ABCClass">
+ <summary>
+ ABC鍒嗙被
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialSpec">
+ <summary>
+ 鐗╂枡瑙勬牸
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.InPlaceCode">
+ <summary>
+ 榛樿鍏ュ簱搴撲綅
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialUnit">
+ <summary>
+ 搴撳瓨鍗曚綅
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.POUnit">
+ <summary>
+ 閲囪喘鍗曚綅
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.Color">
+ <summary>
+ 棰滆壊
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.Weight">
+ <summary>
+ 閲嶉噺
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.SNP">
+ <summary>
+ 鏍囧寘鏁伴噺
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.TranslateRate">
+ <summary>
+ 鎹㈢畻鐜�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.BatchRuleId">
+ <summary>
+ 鎵规灞炴�ц鍒�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.ControlRuleId">
+ <summary>
+ 鎺у埗灞炴�ц鍒�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.IsDisabled">
+ <summary>
+ 鏄惁绂佺敤
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialDesc">
+ <summary>
+ 鎻忚堪
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.CreatedTime">
+ <summary>
+ 鍒涘缓鏃堕棿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.UpdatedTime">
+ <summary>
+ 鏇存柊鏃堕棿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.CreatedUserName">
+ <summary>
+ 鍒涘缓鑰呭悕绉�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearch.UpdatedUserName">
+ <summary>
+ 淇敼鑰呭悕绉�
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.WmsMaterialSearchNonPage">
+ <summary>
+ 鐗╂枡淇℃伅琛ㄤ笉鍒嗛〉鏌ヨ鍙傛暟
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialName">
+ <summary>
+ 鐗╂枡鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialCode">
+ <summary>
+ 鐗╂枡缂栧彿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.ErpCode">
+ <summary>
+ ERP缂栧彿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialTypeName">
+ <summary>
+ 鐗╂枡绫诲瀷鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialTypeDescr">
+ <summary>
+ 鐗╂枡绫诲瀷鎻忚堪
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialType">
+ <summary>
+ 鐗╂枡绫诲瀷
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialGroup">
+ <summary>
+ 鐗╂枡缁�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.ABCClassName">
+ <summary>
+ ABC鍒嗙被鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.ABCClass">
+ <summary>
+ ABC鍒嗙被
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialSpec">
+ <summary>
+ 鐗╂枡瑙勬牸
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.InPlaceCode">
+ <summary>
+ 榛樿鍏ュ簱搴撲綅
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialUnit">
+ <summary>
+ 搴撳瓨鍗曚綅
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.POUnit">
+ <summary>
+ 閲囪喘鍗曚綅
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.Color">
+ <summary>
+ 棰滆壊
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.Weight">
+ <summary>
+ 閲嶉噺
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.SNP">
+ <summary>
+ 鏍囧寘鏁伴噺
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.TranslateRate">
+ <summary>
+ 鎹㈢畻鐜�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.BatchRuleId">
+ <summary>
+ 鎵规灞炴�ц鍒�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.ControlRuleId">
+ <summary>
+ 鎺у埗灞炴�ц鍒�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.IsDisabled">
+ <summary>
+ 鏄惁绂佺敤
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialDesc">
+ <summary>
+ 鎻忚堪
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.CreatedTime">
+ <summary>
+ 鍒涘缓鏃堕棿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.UpdatedTime">
+ <summary>
+ 鏇存柊鏃堕棿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.CreatedUserName">
+ <summary>
+ 鍒涘缓鑰呭悕绉�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.UpdatedUserName">
+ <summary>
+ 淇敼鑰呭悕绉�
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.WmsMaterialInput">
+ <summary>
+ 鐗╂枡淇℃伅琛ㄨ緭鍏ュ弬鏁�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialName">
+ <summary>
+ 鐗╂枡鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialCode">
+ <summary>
+ 鐗╂枡缂栧彿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.ErpCode">
+ <summary>
+ ERP缂栧彿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialTypeName">
+ <summary>
+ 鐗╂枡绫诲瀷鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialTypeDescr">
+ <summary>
+ 鐗╂枡绫诲瀷鎻忚堪
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialType">
+ <summary>
+ 鐗╂枡绫诲瀷
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialGroup">
+ <summary>
+ 鐗╂枡缁�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.ABCClassName">
+ <summary>
+ ABC鍒嗙被鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.ABCClass">
+ <summary>
+ ABC鍒嗙被
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialSpec">
+ <summary>
+ 鐗╂枡瑙勬牸
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.InPlaceCode">
+ <summary>
+ 榛樿鍏ュ簱搴撲綅
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialUnit">
+ <summary>
+ 搴撳瓨鍗曚綅
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.POUnit">
+ <summary>
+ 閲囪喘鍗曚綅
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.Color">
+ <summary>
+ 棰滆壊
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.Weight">
+ <summary>
+ 閲嶉噺
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.SNP">
+ <summary>
+ 鏍囧寘鏁伴噺
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.TranslateRate">
+ <summary>
+ 鎹㈢畻鐜�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.BatchRuleId">
+ <summary>
+ 鎵规灞炴�ц鍒�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.ControlRuleId">
+ <summary>
+ 鎺у埗灞炴�ц鍒�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.IsDisabled">
+ <summary>
+ 鏄惁绂佺敤
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialDesc">
+ <summary>
+ 鎻忚堪
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.AddWmsMaterialInput">
+ <summary>
+ 鐗╂枡淇℃伅琛ㄦ柊澧炲弬鏁�
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.DeleteWmsMaterialInput">
+ <summary>
+ 鐗╂枡淇℃伅琛ㄥ垹闄ゅ弬鏁�
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.UpdateWmsMaterialInput">
+ <summary>
+ 鐗╂枡淇℃伅琛ㄦ洿鏂板弬鏁�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.UpdateWmsMaterialInput.Id">
+ <summary>
+ Id涓婚敭
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.QueryeWmsMaterialInput">
+ <summary>
+ 鐗╂枡淇℃伅琛ㄨ幏鍙栧崟涓弬鏁�
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.WmsMaterialOutput">
+ <summary>
+ 鐗╂枡淇℃伅琛ㄨ緭鍑哄弬鏁�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialName">
+ <summary>
+ 鐗╂枡鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialCode">
+ <summary>
+ 鐗╂枡缂栧彿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.ErpCode">
+ <summary>
+ ERP缂栧彿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialTypeName">
+ <summary>
+ 鐗╂枡绫诲瀷鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialTypeDescr">
+ <summary>
+ 鐗╂枡绫诲瀷鎻忚堪
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialType">
+ <summary>
+ 鐗╂枡绫诲瀷
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialGroup">
+ <summary>
+ 鐗╂枡缁�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.ABCClassName">
+ <summary>
+ ABC鍒嗙被鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.ABCClass">
+ <summary>
+ ABC鍒嗙被
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialSpec">
+ <summary>
+ 鐗╂枡瑙勬牸
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.InPlaceCode">
+ <summary>
+ 榛樿鍏ュ簱搴撲綅
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialUnit">
+ <summary>
+ 搴撳瓨鍗曚綅
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.POUnit">
+ <summary>
+ 閲囪喘鍗曚綅
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.Color">
+ <summary>
+ 棰滆壊
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.Weight">
+ <summary>
+ 閲嶉噺
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.SNP">
+ <summary>
+ 鏍囧寘鏁伴噺
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.TranslateRate">
+ <summary>
+ 鎹㈢畻鐜�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.BatchRuleId">
+ <summary>
+ 鎵规灞炴�ц鍒�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.ControlRuleId">
+ <summary>
+ 鎺у埗灞炴�ц鍒�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.IsDisabled">
+ <summary>
+ 鏄惁绂佺敤
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialDesc">
+ <summary>
+ 鎻忚堪
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.Id">
+ <summary>
+ Id涓婚敭
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.CreatedTime">
+ <summary>
+ 鍒涘缓鏃堕棿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.UpdatedTime">
+ <summary>
+ 鏇存柊鏃堕棿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.CreatedUserName">
+ <summary>
+ 鍒涘缓鑰呭悕绉�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsMaterialOutput.UpdatedUserName">
+ <summary>
+ 淇敼鑰呭悕绉�
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.WmsMaterialService">
+ <summary>
+ 鐗╂枡淇℃伅琛ㄦ湇鍔�
+ </summary>
+ </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>
+ </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>
+ </member>
+ <member name="M:Admin.NET.Application.WmsMaterialService.Add(Admin.NET.Application.AddWmsMaterialInput)">
+ <summary>
+ 澧炲姞鐗╂枡淇℃伅琛�
+ </summary>
+ <param name="input"></param>
+ <returns></returns>
+ </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)">
+ <summary>
+ 鏇存柊鐗╂枡淇℃伅琛�
+ </summary>
+ <param name="input"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsMaterialService.ImportExcelAsync(Microsoft.AspNetCore.Http.IFormFile)">
+ <summary>
+ Excel妯℃澘瀵煎叆鐗╂枡淇℃伅琛ㄥ姛鑳�
+ </summary>
+ <param name="file">Excel妯℃澘鏂囦欢</param>
+ <returns>瀵煎叆鐨勮褰曟暟</returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsMaterialService.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.WmsMaterialService.DownloadExcelTemplate(System.String)">
+ <summary>
+ 鏍规嵁鐗堟湰涓嬭浇鐗╂枡淇℃伅琛ㄧ殑Excel瀵煎叆妯℃澘
+ </summary>
+ <param name="version">妯℃澘鐗堟湰</param>
+ <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsMaterialService.CheckExisit(Admin.NET.Core.WmsMaterial,System.Boolean)">
+ <summary>
+ 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-鏁版嵁搴�
+ </summary>
+ <param name="input"></param>
+ <param name="isEdit"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsMaterialService.CheckExisitForImport(System.Collections.Generic.List{Admin.NET.Core.WmsMaterial})">
+ <summary>
+ 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-瀵煎叆鏃堕獙璇�
+ </summary>
+ <param name="inputs"></param>
+ <returns></returns>
+ </member>
<member name="T:Admin.NET.Application.AccessDetailsDto">
<summary>
鍑哄叆搴撹褰曡緭鍑哄弬鏁�
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
new file mode 100644
index 0000000..71d1f55
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
@@ -0,0 +1,420 @@
+锘縰sing Admin.NET.Core;
+using Admin.NET.Core.Service;
+using System.ComponentModel.DataAnnotations;
+
+namespace Admin.NET.Application
+{
+
+ /// <summary>
+ /// 鐗╂枡淇℃伅琛ㄦ煡璇㈠弬鏁�
+ /// </summary>
+ public class WmsMaterialSearch : PageInputBase
+ {
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public virtual string MaterialName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ public virtual string MaterialCode { get; set; }
+
+ /// <summary>
+ /// ERP缂栧彿
+ /// </summary>
+ public virtual string ErpCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷鍚嶇О
+ /// </summary>
+ public virtual string MaterialTypeName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷鎻忚堪
+ /// </summary>
+ public virtual string MaterialTypeDescr { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
+ public virtual int? MaterialType { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缁�
+ /// </summary>
+ public virtual string MaterialGroup { get; set; }
+
+ /// <summary>
+ /// ABC鍒嗙被鍚嶇О
+ /// </summary>
+ public virtual string ABCClassName { get; set; }
+
+ /// <summary>
+ /// ABC鍒嗙被
+ /// </summary>
+ public virtual int? ABCClass { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ public virtual string MaterialSpec { get; set; }
+
+ /// <summary>
+ /// 榛樿鍏ュ簱搴撲綅
+ /// </summary>
+ public virtual string InPlaceCode { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鍗曚綅
+ /// </summary>
+ public virtual string MaterialUnit { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍗曚綅
+ /// </summary>
+ public virtual string POUnit { get; set; }
+
+ /// <summary>
+ /// 棰滆壊
+ /// </summary>
+ public virtual string Color { get; set; }
+
+ /// <summary>
+ /// 閲嶉噺
+ /// </summary>
+ public virtual string Weight { get; set; }
+
+ /// <summary>
+ /// 鏍囧寘鏁伴噺
+ /// </summary>
+ public virtual decimal? SNP { get; set; }
+
+ /// <summary>
+ /// 鎹㈢畻鐜�
+ /// </summary>
+ public virtual decimal? TranslateRate { get; set; }
+
+ /// <summary>
+ /// 鎵规灞炴�ц鍒�
+ /// </summary>
+ public virtual long? BatchRuleId { get; set; }
+
+ /// <summary>
+ /// 鎺у埗灞炴�ц鍒�
+ /// </summary>
+ public virtual long? ControlRuleId { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public virtual bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// 鎻忚堪
+ /// </summary>
+ public virtual string MaterialDesc { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public virtual List<string> CreatedTime { get; set; }
+
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ /// </summary>
+ public virtual List<string> UpdatedTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呭悕绉�
+ /// </summary>
+ public virtual string CreatedUserName { get; set; }
+
+ /// <summary>
+ /// 淇敼鑰呭悕绉�
+ /// </summary>
+ public virtual string UpdatedUserName { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鐗╂枡淇℃伅琛ㄤ笉鍒嗛〉鏌ヨ鍙傛暟
+ /// </summary>
+ public class WmsMaterialSearchNonPage : PageInputNonPageBase
+ {
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public virtual string MaterialName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ public virtual string MaterialCode { get; set; }
+
+ /// <summary>
+ /// ERP缂栧彿
+ /// </summary>
+ public virtual string ErpCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷鍚嶇О
+ /// </summary>
+ public virtual string MaterialTypeName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷鎻忚堪
+ /// </summary>
+ public virtual string MaterialTypeDescr { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
+ public virtual int? MaterialType { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缁�
+ /// </summary>
+ public virtual string MaterialGroup { get; set; }
+
+ /// <summary>
+ /// ABC鍒嗙被鍚嶇О
+ /// </summary>
+ public virtual string ABCClassName { get; set; }
+
+ /// <summary>
+ /// ABC鍒嗙被
+ /// </summary>
+ public virtual int? ABCClass { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ public virtual string MaterialSpec { get; set; }
+
+ /// <summary>
+ /// 榛樿鍏ュ簱搴撲綅
+ /// </summary>
+ public virtual string InPlaceCode { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鍗曚綅
+ /// </summary>
+ public virtual string MaterialUnit { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍗曚綅
+ /// </summary>
+ public virtual string POUnit { get; set; }
+
+ /// <summary>
+ /// 棰滆壊
+ /// </summary>
+ public virtual string Color { get; set; }
+
+ /// <summary>
+ /// 閲嶉噺
+ /// </summary>
+ public virtual string Weight { get; set; }
+
+ /// <summary>
+ /// 鏍囧寘鏁伴噺
+ /// </summary>
+ public virtual decimal? SNP { get; set; }
+
+ /// <summary>
+ /// 鎹㈢畻鐜�
+ /// </summary>
+ public virtual decimal? TranslateRate { get; set; }
+
+ /// <summary>
+ /// 鎵规灞炴�ц鍒�
+ /// </summary>
+ public virtual long? BatchRuleId { get; set; }
+
+ /// <summary>
+ /// 鎺у埗灞炴�ц鍒�
+ /// </summary>
+ public virtual long? ControlRuleId { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public virtual bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// 鎻忚堪
+ /// </summary>
+ public virtual string MaterialDesc { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public virtual List<DateTimeOffset>? CreatedTime { get; set; }
+
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ /// </summary>
+ public virtual List<DateTimeOffset>? UpdatedTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呭悕绉�
+ /// </summary>
+ public virtual string CreatedUserName { get; set; }
+
+ /// <summary>
+ /// 淇敼鑰呭悕绉�
+ /// </summary>
+ public virtual string UpdatedUserName { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鐗╂枡淇℃伅琛ㄨ緭鍏ュ弬鏁�
+ /// </summary>
+ public class WmsMaterialInput
+ {
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [Required(ErrorMessage = "鐗╂枡鍚嶇О涓嶈兘涓虹┖")]
+ public virtual string MaterialName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [Required(ErrorMessage = "鐗╂枡缂栧彿涓嶈兘涓虹┖")]
+ public virtual string MaterialCode { get; set; }
+
+ /// <summary>
+ /// ERP缂栧彿
+ /// </summary>
+ public virtual string ErpCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷鍚嶇О
+ /// </summary>
+ public virtual string MaterialTypeName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷鎻忚堪
+ /// </summary>
+ public virtual string MaterialTypeDescr { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
+ public virtual int? MaterialType { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缁�
+ /// </summary>
+ public virtual string MaterialGroup { get; set; }
+
+ /// <summary>
+ /// ABC鍒嗙被鍚嶇О
+ /// </summary>
+ public virtual string ABCClassName { get; set; }
+
+ /// <summary>
+ /// ABC鍒嗙被
+ /// </summary>
+ public virtual int? ABCClass { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ public virtual string MaterialSpec { get; set; }
+
+ /// <summary>
+ /// 榛樿鍏ュ簱搴撲綅
+ /// </summary>
+ public virtual string InPlaceCode { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鍗曚綅
+ /// </summary>
+ public virtual string MaterialUnit { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍗曚綅
+ /// </summary>
+ public virtual string POUnit { get; set; }
+
+ /// <summary>
+ /// 棰滆壊
+ /// </summary>
+ public virtual string Color { get; set; }
+
+ /// <summary>
+ /// 閲嶉噺
+ /// </summary>
+ public virtual string Weight { get; set; }
+
+ /// <summary>
+ /// 鏍囧寘鏁伴噺
+ /// </summary>
+ public virtual decimal? SNP { get; set; }
+
+ /// <summary>
+ /// 鎹㈢畻鐜�
+ /// </summary>
+ public virtual decimal? TranslateRate { get; set; }
+
+ /// <summary>
+ /// 鎵规灞炴�ц鍒�
+ /// </summary>
+ public virtual long? BatchRuleId { get; set; }
+
+ /// <summary>
+ /// 鎺у埗灞炴�ц鍒�
+ /// </summary>
+ public virtual long? ControlRuleId { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public virtual bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// 鎻忚堪
+ /// </summary>
+ public virtual string MaterialDesc { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鐗╂枡淇℃伅琛ㄦ柊澧炲弬鏁�
+ /// </summary>
+ public class AddWmsMaterialInput : WmsMaterialInput
+ {
+ }
+
+ /// <summary>
+ /// 鐗╂枡淇℃伅琛ㄥ垹闄ゅ弬鏁�
+ /// </summary>
+ public class DeleteWmsMaterialInput : BaseId
+ {
+ }
+
+ /// <summary>
+ /// 鐗╂枡淇℃伅琛ㄦ洿鏂板弬鏁�
+ /// </summary>
+ public class UpdateWmsMaterialInput : WmsMaterialInput
+ {
+ /// <summary>
+ /// Id涓婚敭
+ /// </summary>
+ [Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
+ public long? Id { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鐗╂枡淇℃伅琛ㄨ幏鍙栧崟涓弬鏁�
+ /// </summary>
+ public class QueryeWmsMaterialInput : BaseId
+ {
+
+ }
+}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
new file mode 100644
index 0000000..8b40223
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
@@ -0,0 +1,142 @@
+锘縰sing Admin.NET.Core.Util.LowCode.Dto;
+using System;
+
+namespace Admin.NET.Application
+{
+ /// <summary>
+ /// 鐗╂枡淇℃伅琛ㄨ緭鍑哄弬鏁�
+ /// </summary>
+ public class WmsMaterialOutput
+ {
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string MaterialName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ public string MaterialCode { get; set; }
+
+ /// <summary>
+ /// ERP缂栧彿
+ /// </summary>
+ public string ErpCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷鍚嶇О
+ /// </summary>
+ public string MaterialTypeName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷鎻忚堪
+ /// </summary>
+ public string MaterialTypeDescr { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
+ public int? MaterialType { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缁�
+ /// </summary>
+ public string MaterialGroup { get; set; }
+
+ /// <summary>
+ /// ABC鍒嗙被鍚嶇О
+ /// </summary>
+ public string ABCClassName { get; set; }
+
+ /// <summary>
+ /// ABC鍒嗙被
+ /// </summary>
+ public int? ABCClass { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ public string MaterialSpec { get; set; }
+
+ /// <summary>
+ /// 榛樿鍏ュ簱搴撲綅
+ /// </summary>
+ public string InPlaceCode { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鍗曚綅
+ /// </summary>
+ public string MaterialUnit { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍗曚綅
+ /// </summary>
+ public string POUnit { get; set; }
+
+ /// <summary>
+ /// 棰滆壊
+ /// </summary>
+ public string Color { get; set; }
+
+ /// <summary>
+ /// 閲嶉噺
+ /// </summary>
+ public string Weight { get; set; }
+
+ /// <summary>
+ /// 鏍囧寘鏁伴噺
+ /// </summary>
+ public decimal? SNP { get; set; }
+
+ /// <summary>
+ /// 鎹㈢畻鐜�
+ /// </summary>
+ public decimal? TranslateRate { get; set; }
+
+ /// <summary>
+ /// 鎵规灞炴�ц鍒�
+ /// </summary>
+ public long? BatchRuleId { get; set; }
+
+ /// <summary>
+ /// 鎺у埗灞炴�ц鍒�
+ /// </summary>
+ public long? ControlRuleId { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// 鎻忚堪
+ /// </summary>
+ public string MaterialDesc { get; set; }
+
+ /// <summary>
+ /// Id涓婚敭
+ /// </summary>
+ public long? Id { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTimeOffset? CreatedTime { get; set; }
+
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ /// </summary>
+ public DateTimeOffset? UpdatedTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呭悕绉�
+ /// </summary>
+ public string CreatedUserName { get; set; }
+
+ /// <summary>
+ /// 淇敼鑰呭悕绉�
+ /// </summary>
+ public string UpdatedUserName { get; set; }
+
+ }
+}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/IWmsMaterialService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/IWmsMaterialService.cs
new file mode 100644
index 0000000..e9edf4a
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/IWmsMaterialService.cs
@@ -0,0 +1,22 @@
+锘縰sing Admin.NET.Core;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace Admin.NET.Application
+{
+ public interface IWmsMaterialService
+ {
+ Task<WmsMaterialOutput> Get([FromQuery] QueryeWmsMaterialInput input);
+ Task<List<WmsMaterialOutput>> List([FromQuery] WmsMaterialInput input);
+ Task<PageResult<WmsMaterialOutput>> Page([FromQuery] WmsMaterialSearch input);
+ Task<List<WmsMaterialOutput>> ListNonPageAsync([FromQuery] WmsMaterialSearchNonPage input);
+
+ Task Add(AddWmsMaterialInput input);
+ Task Update(UpdateWmsMaterialInput input);
+ Task Delete(DeleteWmsMaterialInput input);
+ Task<int> ImportExcelAsync(IFormFile file);
+ IActionResult DownloadExcelTemplate(string version);
+ }
+}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Map/WmsMaterialMapper.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Map/WmsMaterialMapper.cs
new file mode 100644
index 0000000..ae0cb30
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Map/WmsMaterialMapper.cs
@@ -0,0 +1,18 @@
+锘縰sing Mapster;
+using Admin.NET.Core;
+
+namespace Admin.NET.Application
+{
+ public class WmsMaterialMapper : IRegister
+ {
+ public void Register(TypeAdapterConfig config)
+ {
+ config.ForType<AddWmsMaterialInput, WmsMaterial>()
+ ;
+ config.ForType<UpdateWmsMaterialInput, WmsMaterial>()
+ ;
+ config.ForType<WmsMaterial, WmsMaterialOutput>()
+ ;
+ }
+ }
+}
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
new file mode 100644
index 0000000..bc3e25c
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
@@ -0,0 +1,637 @@
+锘縰sing Furion.DatabaseAccessor;
+using Furion.DatabaseAccessor.Extensions;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Furion.FriendlyException;
+using Admin.NET.Core;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System.Linq.Dynamic.Core;
+using Microsoft.AspNetCore.Http;
+using System.Text;
+using System.Web;
+using System.ComponentModel;
+using System.Data;
+namespace Admin.NET.Application
+{
+ /// <summary>
+ /// 鐗╂枡淇℃伅琛ㄦ湇鍔�
+ /// </summary>
+ [ApiDescriptionSettings("WmsBase", Name = "WmsMaterial", Order = 100)]
+ [Route("api")]
+ public class WmsMaterialService : IWmsMaterialService, IDynamicApiController, ITransient
+ {
+ private readonly IRepository<WmsMaterial,MasterDbContextLocator> _wmsMaterialRep;
+ private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
+ private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
+ private readonly ISysExcelTemplateService _sysExcelTemplateService;
+ private readonly static object _lock = new();
+
+ public WmsMaterialService(
+ IRepository<WmsMaterial,MasterDbContextLocator> wmsMaterialRep
+ ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
+ ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
+ ,ISysExcelTemplateService sysExcelTemplateService
+ )
+ {
+ _wmsMaterialRep = wmsMaterialRep;
+ _sysDictTypeRep = sysDictTypeRep;
+ _sysDictDataRep = sysDictDataRep;
+ _sysExcelTemplateService = sysExcelTemplateService;
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ鐗╂枡淇℃伅琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet("WmsMaterial/page")]
+ public async Task<PageResult<WmsMaterialOutput>> Page([FromQuery] WmsMaterialSearch input)
+ {
+ var wmsMaterials = await _wmsMaterialRep.DetachedEntities
+ .Where(!string.IsNullOrEmpty(input.MaterialName), u => EF.Functions.Like(u.MaterialName, $"%{input.MaterialName.Trim()}%"))
+ .Where(!string.IsNullOrEmpty(input.MaterialCode), u => u.MaterialCode == input.MaterialCode)
+ .Where(!string.IsNullOrEmpty(input.ErpCode), u => u.ErpCode == input.ErpCode)
+ .Where(!string.IsNullOrEmpty(input.MaterialTypeName), u => u.MaterialTypeName == input.MaterialTypeName)
+ .Where(!string.IsNullOrEmpty(input.MaterialTypeDescr), u => u.MaterialTypeDescr == input.MaterialTypeDescr)
+ .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(!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)
+ .Where(!string.IsNullOrEmpty(input.POUnit), u => u.POUnit == input.POUnit)
+ .Where(!string.IsNullOrEmpty(input.Color), u => u.Color == input.Color)
+ .Where(!string.IsNullOrEmpty(input.Weight), u => u.Weight == input.Weight)
+ .Where(input.SNP != null, u => u.SNP == input.SNP)
+ .Where(input.TranslateRate != null, u => u.TranslateRate == input.TranslateRate)
+ .Where(input.BatchRuleId != null, u => u.BatchRuleId == input.BatchRuleId)
+ .Where(input.ControlRuleId != null, u => u.ControlRuleId == input.ControlRuleId)
+ .Where(input.IsDisabled != null, u => u.IsDisabled == input.IsDisabled)
+ .Where(!string.IsNullOrEmpty(input.MaterialDesc), u => u.MaterialDesc == input.MaterialDesc)
+ .Where(input.CreatedTime!=null, u => u.CreatedTime>= Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime<= Convert.ToDateTime(input.CreatedTime[1]))
+ .Where(input.UpdatedTime!=null, u => u.UpdatedTime>= Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime<= Convert.ToDateTime(input.UpdatedTime[1]))
+ .Where(!string.IsNullOrEmpty(input.CreatedUserName), u => u.CreatedUserName == input.CreatedUserName)
+ .Where(!string.IsNullOrEmpty(input.UpdatedUserName), u => u.UpdatedUserName == input.UpdatedUserName)
+ .OrderBy(PageInputOrder.OrderBuilder<WmsMaterialSearch>(input))
+ .ProjectToType<WmsMaterialOutput>()
+ .ToADPagedListAsync(input.PageNo, input.PageSize);
+ return wmsMaterials;
+ }
+
+ /// <summary>
+ /// 涓嶅垎椤垫煡璇㈢墿鏂欎俊鎭〃鍒楄〃
+ /// </summary>
+ /// <param name="input">鐗╂枡淇℃伅琛ㄦ煡璇㈠弬鏁�</param>
+ /// <returns>(鐗╂枡淇℃伅琛�)瀹炰緥鍒楄〃</returns>
+ [HttpGet("WmsMaterial/listNonPage")]
+ public async Task<List<WmsMaterialOutput>> ListNonPageAsync([FromQuery] WmsMaterialSearchNonPage input)
+ {
+ var pMaterialName = input.MaterialName?.Trim() ?? "";
+ var pMaterialCode = input.MaterialCode?.Trim() ?? "";
+ var pErpCode = input.ErpCode?.Trim() ?? "";
+ var pMaterialTypeName = input.MaterialTypeName?.Trim() ?? "";
+ var pMaterialTypeDescr = input.MaterialTypeDescr?.Trim() ?? "";
+ var pMaterialType = input.MaterialType;
+ var pMaterialGroup = input.MaterialGroup?.Trim() ?? "";
+ var pABCClassName = input.ABCClassName?.Trim() ?? "";
+ var pABCClass = input.ABCClass;
+ var pMaterialSpec = input.MaterialSpec?.Trim() ?? "";
+ var pInPlaceCode = input.InPlaceCode?.Trim() ?? "";
+ var pMaterialUnit = input.MaterialUnit?.Trim() ?? "";
+ var pPOUnit = input.POUnit?.Trim() ?? "";
+ var pColor = input.Color?.Trim() ?? "";
+ var pWeight = input.Weight?.Trim() ?? "";
+ var pSNP = input.SNP;
+ var pTranslateRate = input.TranslateRate;
+ var pBatchRuleId = input.BatchRuleId;
+ var pControlRuleId = input.ControlRuleId;
+ var pIsDisabled = input.IsDisabled;
+ var pMaterialDesc = input.MaterialDesc?.Trim() ?? "";
+ var pCreatedTime = input.CreatedTime;
+ var pUpdatedTime = input.UpdatedTime;
+ var pCreatedUserName = input.CreatedUserName?.Trim() ?? "";
+ var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
+ var wmsMaterials = await _wmsMaterialRep.DetachedEntities
+ .Where(!string.IsNullOrEmpty(pMaterialName), u => EF.Functions.Like(u.MaterialName, $"%{pMaterialName}%"))
+ .Where(!string.IsNullOrEmpty(pMaterialCode), u => u.MaterialCode == pMaterialCode)
+ .Where(!string.IsNullOrEmpty(pErpCode), u => u.ErpCode == pErpCode)
+ .Where(!string.IsNullOrEmpty(pMaterialTypeName), u => u.MaterialTypeName == pMaterialTypeName)
+ .Where(!string.IsNullOrEmpty(pMaterialTypeDescr), u => u.MaterialTypeDescr == pMaterialTypeDescr)
+ .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(!string.IsNullOrEmpty(pMaterialSpec), u => u.MaterialSpec == pMaterialSpec)
+ .Where(!string.IsNullOrEmpty(pInPlaceCode), u => u.InPlaceCode == pInPlaceCode)
+ .Where(!string.IsNullOrEmpty(pMaterialUnit), u => u.MaterialUnit == pMaterialUnit)
+ .Where(!string.IsNullOrEmpty(pPOUnit), u => u.POUnit == pPOUnit)
+ .Where(!string.IsNullOrEmpty(pColor), u => u.Color == pColor)
+ .Where(!string.IsNullOrEmpty(pWeight), u => u.Weight == pWeight)
+ .Where(pSNP != null, u => u.SNP == pSNP)
+ .Where(pTranslateRate != null, u => u.TranslateRate == pTranslateRate)
+ .Where(pBatchRuleId != null, u => u.BatchRuleId == pBatchRuleId)
+ .Where(pControlRuleId != null, u => u.ControlRuleId == pControlRuleId)
+ .Where(pIsDisabled != null, u => u.IsDisabled == pIsDisabled)
+ .Where(!string.IsNullOrEmpty(pMaterialDesc), u => u.MaterialDesc == pMaterialDesc)
+ .Where(input.CreatedTime!=null, u => u.CreatedTime>= Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime<= Convert.ToDateTime(input.CreatedTime[1]))
+ .Where(input.UpdatedTime!=null, u => u.UpdatedTime>= Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime<= Convert.ToDateTime(input.UpdatedTime[1]))
+ .Where(!string.IsNullOrEmpty(pCreatedUserName), u => u.CreatedUserName == pCreatedUserName)
+ .Where(!string.IsNullOrEmpty(pUpdatedUserName), u => u.UpdatedUserName == pUpdatedUserName)
+ .OrderBy(PageInputOrder.OrderNonPageBuilder(input))
+ .ProjectToType<WmsMaterialOutput>()
+ .ToListAsync();
+ return wmsMaterials;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡淇℃伅琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet("WmsMaterial/detail")]
+ public async Task<WmsMaterialOutput> Get([FromQuery] QueryeWmsMaterialInput input)
+ {
+ return (await _wmsMaterialRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsMaterialOutput>();
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡淇℃伅琛ㄥ垪琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet("WmsMaterial/list")]
+ public async Task<List<WmsMaterialOutput>> List([FromQuery] WmsMaterialInput input)
+ {
+ return await _wmsMaterialRep.DetachedEntities.ProjectToType<WmsMaterialOutput>().ToListAsync();
+ }
+
+ #region 澧炪�佸垹銆佹敼
+
+ /// <summary>
+ /// 澧炲姞鐗╂枡淇℃伅琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost("WmsMaterial/add")]
+ public async Task Add(AddWmsMaterialInput input)
+ {
+ var wmsMaterial = input.Adapt<WmsMaterial>();
+ //楠岃瘉
+ await CheckExisit(wmsMaterial);
+
+ wmsMaterial.CreatedUserId = wmsMaterial.UpdatedUserId = SysHelper.GetUserId();
+ wmsMaterial.CreatedUserName = wmsMaterial.UpdatedUserName = SysHelper.GetUserName();
+ wmsMaterial.CreatedTime = wmsMaterial.UpdatedTime = SysHelper.GetNowTime();
+ await _wmsMaterialRep.InsertAsync(wmsMaterial);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鐗╂枡淇℃伅琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost("WmsMaterial/delete")]
+ public async Task Delete(DeleteWmsMaterialInput input)
+ {
+ var wmsMaterial = await _wmsMaterialRep.FirstOrDefaultAsync(u => u.Id == input.Id);
+ await _wmsMaterialRep.DeleteAsync(wmsMaterial);
+
+ }
+
+ /// <summary>
+ /// 鏇存柊鐗╂枡淇℃伅琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost("WmsMaterial/edit")]
+ public async Task Update(UpdateWmsMaterialInput input)
+ {
+ var isExist = await _wmsMaterialRep.AnyAsync(u => u.Id == input.Id, false);
+ if (!isExist) throw Oops.Oh(ErrorCode.D1002);
+
+ var wmsMaterial = input.Adapt<WmsMaterial>();
+ //楠岃瘉
+ await CheckExisit(wmsMaterial,true);
+
+ wmsMaterial.UpdatedUserId = SysHelper.GetUserId();
+ wmsMaterial.UpdatedUserName = SysHelper.GetUserName();
+ wmsMaterial.UpdatedTime = SysHelper.GetNowTime();
+ await _wmsMaterialRep.UpdateAsync(wmsMaterial,ignoreNullValues:true);
+ }
+
+ #endregion
+
+ #region 瀵煎叆
+
+ /// <summary>
+ /// Excel妯℃澘瀵煎叆鐗╂枡淇℃伅琛ㄥ姛鑳�
+ /// </summary>
+ /// <param name="file">Excel妯℃澘鏂囦欢</param>
+ /// <returns>瀵煎叆鐨勮褰曟暟</returns>
+ [HttpPost("WmsMaterial/importExcel")]
+ public async Task<int> ImportExcelAsync(IFormFile file)
+ {
+ int _HeadStartLine = 2;//绗�1琛屾槸璇存槑,绗�2琛屾槸鍒楀悕
+ int _DataStartLine = 3;//绗�3琛屽紑濮嬫槸鏁版嵁
+
+ DataTable importDataTable = ExcelUtil.ImportExcelToDataTable(file, _HeadStartLine, _DataStartLine);
+ var addList =await CommonImport(importDataTable, _DataStartLine);
+
+ lock (_lock)
+ {
+ _wmsMaterialRep.InsertAsync(addList);
+
+ }
+ await Task.CompletedTask;
+ return addList.Count;
+ }
+
+ /// <summary>
+ /// DataTable杞崲瀹炰綋瀵硅薄鍒楄〃
+ /// </summary>
+ /// <param name="dataTable"></param>
+ /// <param name="dataStartLine">妯＄増鍒楀悕寮�濮嬭</param>
+ /// <returns></returns>
+ private async Task<List<WmsMaterial>> CommonImport(DataTable dataTable, int dataStartLine)
+ {
+
+ var details = new List<WmsMaterial>();
+ int index = dataStartLine;//妯＄増鍒楀悕寮�濮嬭
+ foreach (System.Data.DataRow row in dataTable.Rows)
+ {
+ index++;
+
+ //瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
+
+ var addItem = new WmsMaterial()
+ {
+ CreatedTime = SysHelper.GetNowTime(),
+ CreatedUserId = SysHelper.GetUserId(),
+ CreatedUserName = SysHelper.GetUserName(),
+ UpdatedTime = SysHelper.GetNowTime(),
+ UpdatedUserId = SysHelper.GetUserId(),
+ UpdatedUserName = SysHelper.GetUserName()
+ };
+ #region 瀹氫箟鍙橀噺
+ var _MaterialName = "";//鐗╂枡鍚嶇О
+ var _MaterialCode = "";//鐗╂枡缂栧彿
+ var _ErpCode = "";//ERP缂栧彿
+ var _MaterialTypeName = "";//鐗╂枡绫诲瀷鍚嶇О
+ var _MaterialTypeDescr = "";//鐗╂枡绫诲瀷鎻忚堪
+ var _MaterialType = "";//鐗╂枡绫诲瀷
+ var _MaterialGroup = "";//鐗╂枡缁�
+ var _ABCClassName = "";//ABC鍒嗙被鍚嶇О
+ var _ABCClass = "";//ABC鍒嗙被
+ var _MaterialSpec = "";//鐗╂枡瑙勬牸
+ var _InPlaceCode = "";//榛樿鍏ュ簱搴撲綅
+ var _MaterialUnit = "";//搴撳瓨鍗曚綅
+ var _POUnit = "";//閲囪喘鍗曚綅
+ var _Color = "";//棰滆壊
+ var _Weight = "";//閲嶉噺
+ var _SNP = "";//鏍囧寘鏁伴噺
+ var _TranslateRate = "";//鎹㈢畻鐜�
+ var _BatchRuleId = "";//鎵规灞炴�ц鍒�
+ var _ControlRuleId = "";//鎺у埗灞炴�ц鍒�
+ var _IsDisabled = "";//鏄惁绂佺敤
+ var _MaterialDesc = "";//鎻忚堪
+ var _Id = "";//Id涓婚敭
+ #endregion
+
+
+ #region 鍙栧��
+ _MaterialName = row["鐗╂枡鍚嶇О"]?.ToString() ;
+ _MaterialCode = row["鐗╂枡缂栧彿"]?.ToString() ;
+ _ErpCode = row["ERP缂栧彿"]?.ToString() ;
+ _MaterialTypeName = row["鐗╂枡绫诲瀷鍚嶇О"]?.ToString() ;
+ _MaterialTypeDescr = row["鐗╂枡绫诲瀷鎻忚堪"]?.ToString() ;
+ _MaterialType = row["鐗╂枡绫诲瀷"]?.ToString() ;
+ _MaterialGroup = row["鐗╂枡缁�"]?.ToString() ;
+ _ABCClassName = row["ABC鍒嗙被鍚嶇О"]?.ToString() ;
+ _ABCClass = row["ABC鍒嗙被"]?.ToString() ;
+ _MaterialSpec = row["鐗╂枡瑙勬牸"]?.ToString() ;
+ _InPlaceCode = row["榛樿鍏ュ簱搴撲綅"]?.ToString() ;
+ _MaterialUnit = row["搴撳瓨鍗曚綅"]?.ToString() ;
+ _POUnit = row["閲囪喘鍗曚綅"]?.ToString() ;
+ _Color = row["棰滆壊"]?.ToString() ;
+ _Weight = row["閲嶉噺"]?.ToString() ;
+ _SNP = row["鏍囧寘鏁伴噺"]?.ToString() ;
+ _TranslateRate = row["鎹㈢畻鐜�"]?.ToString() ;
+ _BatchRuleId = row["鎵规灞炴�ц鍒�"]?.ToString() ;
+ _ControlRuleId = row["鎺у埗灞炴�ц鍒�"]?.ToString() ;
+ _IsDisabled = row["鏄惁绂佺敤"]?.ToString() ;
+ _MaterialDesc = row["鎻忚堪"]?.ToString() ;
+ _Id = row["Id涓婚敭"]?.ToString() ;
+ #endregion
+
+
+ #region 楠岃瘉
+
+ if (string.IsNullOrEmpty(_MaterialName))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鐗╂枡鍚嶇О]{_MaterialName}涓嶈兘涓虹┖锛�");
+ }
+
+ if(!string.IsNullOrEmpty(_MaterialName))
+ {
+ addItem.MaterialName = (string)_MaterialName;
+ }
+
+ if (string.IsNullOrEmpty(_MaterialCode))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鐗╂枡缂栧彿]{_MaterialCode}涓嶈兘涓虹┖锛�");
+ }
+
+ if(!string.IsNullOrEmpty(_MaterialCode))
+ {
+ addItem.MaterialCode = (string)_MaterialCode;
+ }
+ if(!string.IsNullOrEmpty(_ErpCode))
+ {
+ addItem.ErpCode = (string)_ErpCode;
+ }
+ if(!string.IsNullOrEmpty(_MaterialTypeName))
+ {
+ addItem.MaterialTypeName = (string)_MaterialTypeName;
+ }
+ if(!string.IsNullOrEmpty(_MaterialTypeDescr))
+ {
+ addItem.MaterialTypeDescr = (string)_MaterialTypeDescr;
+ }
+ if(!string.IsNullOrEmpty(_MaterialType))
+ {
+ if (!int.TryParse(_MaterialType, out int outMaterialType)&&!string.IsNullOrEmpty(_MaterialType))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鐗╂枡绫诲瀷]{_MaterialType}鍊间笉姝ｇ‘锛�");
+ }
+ if (outMaterialType <= 0&&!string.IsNullOrEmpty(_MaterialType))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鐗╂枡绫诲瀷]{_MaterialType}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.MaterialType = outMaterialType;
+ }
+
+ }
+ if(!string.IsNullOrEmpty(_MaterialGroup))
+ {
+ addItem.MaterialGroup = (string)_MaterialGroup;
+ }
+ if(!string.IsNullOrEmpty(_ABCClassName))
+ {
+ addItem.ABCClassName = (string)_ABCClassName;
+ }
+ if(!string.IsNullOrEmpty(_ABCClass))
+ {
+ if (!int.TryParse(_ABCClass, out int outABCClass)&&!string.IsNullOrEmpty(_ABCClass))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾ABC鍒嗙被]{_ABCClass}鍊间笉姝ｇ‘锛�");
+ }
+ if (outABCClass <= 0&&!string.IsNullOrEmpty(_ABCClass))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾ABC鍒嗙被]{_ABCClass}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.ABCClass = outABCClass;
+ }
+
+ }
+ if(!string.IsNullOrEmpty(_MaterialSpec))
+ {
+ addItem.MaterialSpec = (string)_MaterialSpec;
+ }
+ if(!string.IsNullOrEmpty(_InPlaceCode))
+ {
+ addItem.InPlaceCode = (string)_InPlaceCode;
+ }
+ if(!string.IsNullOrEmpty(_MaterialUnit))
+ {
+ addItem.MaterialUnit = (string)_MaterialUnit;
+ }
+ if(!string.IsNullOrEmpty(_POUnit))
+ {
+ addItem.POUnit = (string)_POUnit;
+ }
+ if(!string.IsNullOrEmpty(_Color))
+ {
+ addItem.Color = (string)_Color;
+ }
+ if(!string.IsNullOrEmpty(_Weight))
+ {
+ addItem.Weight = (string)_Weight;
+ }
+ if(!string.IsNullOrEmpty(_SNP))
+ {
+ if (!decimal.TryParse(_SNP, out decimal outSNP)&&!string.IsNullOrEmpty(_SNP))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏍囧寘鏁伴噺]{_SNP}鍊间笉姝ｇ‘锛�");
+ }
+ if (outSNP <= 0&&!string.IsNullOrEmpty(_SNP))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏍囧寘鏁伴噺]{_SNP}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.SNP = outSNP;
+ }
+
+ }
+ if(!string.IsNullOrEmpty(_TranslateRate))
+ {
+ if (!decimal.TryParse(_TranslateRate, out decimal outTranslateRate)&&!string.IsNullOrEmpty(_TranslateRate))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎹㈢畻鐜嘳{_TranslateRate}鍊间笉姝ｇ‘锛�");
+ }
+ if (outTranslateRate <= 0&&!string.IsNullOrEmpty(_TranslateRate))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎹㈢畻鐜嘳{_TranslateRate}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.TranslateRate = outTranslateRate;
+ }
+
+ }
+ if(!string.IsNullOrEmpty(_BatchRuleId))
+ {
+ if (!long.TryParse(_BatchRuleId, out long outBatchRuleId)&&!string.IsNullOrEmpty(_BatchRuleId))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎵规灞炴�ц鍒橾{_BatchRuleId}鍊间笉姝ｇ‘锛�");
+ }
+ if (outBatchRuleId <= 0&&!string.IsNullOrEmpty(_BatchRuleId))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎵规灞炴�ц鍒橾{_BatchRuleId}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.BatchRuleId = outBatchRuleId;
+ }
+
+ }
+ if(!string.IsNullOrEmpty(_ControlRuleId))
+ {
+ if (!long.TryParse(_ControlRuleId, out long outControlRuleId)&&!string.IsNullOrEmpty(_ControlRuleId))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒橾{_ControlRuleId}鍊间笉姝ｇ‘锛�");
+ }
+ if (outControlRuleId <= 0&&!string.IsNullOrEmpty(_ControlRuleId))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒橾{_ControlRuleId}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.ControlRuleId = outControlRuleId;
+ }
+
+ }
+ if(!string.IsNullOrEmpty(_IsDisabled))
+ {
+ if(!_IsDisabled.Equals("鏄�") && !_IsDisabled.Equals("鍚�"))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏄惁绂佺敤]{_IsDisabled}鍊间笉姝ｇ‘锛�");
+ }
+ else
+ {
+ bool outIsDisabled = _IsDisabled.Equals("鏄�") ? true : false;
+ addItem.IsDisabled = outIsDisabled;
+ }
+ }
+
+ if(!string.IsNullOrEmpty(_MaterialDesc))
+ {
+ addItem.MaterialDesc = (string)_MaterialDesc;
+ }
+ if(!string.IsNullOrEmpty(_Id))
+ {
+ if (!long.TryParse(_Id, out long outId)&&!string.IsNullOrEmpty(_Id))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾Id涓婚敭]{_Id}鍊间笉姝ｇ‘锛�");
+ }
+ if (outId <= 0&&!string.IsNullOrEmpty(_Id))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾Id涓婚敭]{_Id}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.Id = outId;
+ }
+
+ }
+ #endregion
+
+
+
+ details.Add(addItem);
+ }
+ //楠岄噸
+ await CheckExisitForImport(details);
+
+ return details;
+ }
+
+ /// <summary>
+ /// 鏍规嵁鐗堟湰涓嬭浇鐗╂枡淇℃伅琛ㄧ殑Excel瀵煎叆妯℃澘
+ /// </summary>
+ /// <param name="version">妯℃澘鐗堟湰</param>
+ /// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
+ [HttpGet("WmsMaterial/downloadExcelTemplate")]
+ public IActionResult DownloadExcelTemplate([FromQuery] string version)
+ {
+ string _path = TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増璺緞 + $"\\WmsMaterial{TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増鍚嶇О鍚庣紑}.xlsx";
+ var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(鐗╂枡淇℃伅琛�).xlsx", Encoding.GetEncoding("UTF-8"));
+ return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
+ }
+
+ #endregion
+
+ #region 绉佹湁鏂规硶
+
+ /// <summary>
+ /// 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-鏁版嵁搴�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <param name="isEdit"></param>
+ /// <returns></returns>
+ private async Task CheckExisit( WmsMaterial input,bool isEdit=false)
+ {
+
+
+
+ bool isExist = false;
+ if (!isEdit)//鏂板
+ {
+ //鏁版嵁鏄惁瀛樺湪閲嶅
+ isExist = await _wmsMaterialRep.AnyAsync(u =>
+ u.MaterialCode.Equals(input.MaterialCode)
+ ,false);
+ }
+ else//缂栬緫
+ {
+
+
+
+ //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
+ isExist = await _wmsMaterialRep.AnyAsync(u =>
+ u.Id != input.Id
+ &&u.MaterialCode.Equals(input.MaterialCode)
+ ,false);
+ }
+
+
+
+ if (isExist) throw Oops.Oh(ErrorCode.E0001);
+ }
+
+ /// <summary>
+ /// 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-瀵煎叆鏃堕獙璇�
+ /// </summary>
+ /// <param name="inputs"></param>
+ /// <returns></returns>
+ private async Task CheckExisitForImport(List<WmsMaterial> inputs)
+ {
+ //鏍规嵁鑱斿悎涓婚敭楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏁版嵁鏄惁閲嶅
+ var existExcelItem = inputs.GroupBy(g => new {
+ g.MaterialCode
+ })
+ .Where(g => g.Count() > 1)
+ .Select(s => new {
+ s.Key.MaterialCode
+ }).FirstOrDefault();
+ if (existExcelItem != null)
+ {
+ var wmsMaterial = existExcelItem.Adapt<WmsMaterial>();
+ var item= existExcelItem.Adapt<WmsMaterial>();
+ throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,鐗╂枡缂栧彿[{item.MaterialCode}]宸插瓨鍦�");
+ }
+
+
+
+
+ //鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+ var existDBItem = await _wmsMaterialRep.DetachedEntities.FirstOrDefaultAsync(w=>
+ inputs.Select(s=>""
+ +s.MaterialCode
+ )
+ .Contains(""
+ +w.MaterialCode
+ ));
+ if (existDBItem != null)
+ {
+ var wmsMaterial = existExcelItem.Adapt<WmsMaterial>();
+ var item= existExcelItem.Adapt<WmsMaterial>();
+ throw Oops.Oh($"绯荤粺涓�,鐗╂枡缂栧彿[{item.MaterialCode}]宸插瓨鍦�");
+ }
+ }
+
+ #endregion
+ }
+}
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
new file mode 100644
index 0000000..a267795
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsMaterialImport.xlsx
Binary files differ
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
index a42d87e..f5f2385 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
@@ -19,7 +19,7 @@
/// @(@Model.BusName)鏈嶅姟
/// </summary>
[ApiDescriptionSettings("@Model.ModuleName", Name = "@Model.ClassName", Order = 100)]
- [Route("api/[Controller]")]
+ [Route("api")]
public class @(@Model.ClassName)Service : I@(@Model.ClassName)Service, IDynamicApiController, ITransient
{
private readonly IRepository<@(@Model.ClassName),@(@Model.DatabaseName)> _@(@Model.CamelizeClassName)Rep;
@@ -73,8 +73,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [Description("@Model.ClassName/page")]
- [HttpGet("page")]
+ [HttpGet("@Model.ClassName/page")]
public async Task<PageResult<@(@Model.ClassName)Output>> Page([FromQuery] @(@Model.ClassName)Search input)
{
var @(@Model.CamelizeClassName)s = await _@(@Model.CamelizeClassName)Rep.DetachedEntities
@@ -126,8 +125,7 @@
/// </summary>
/// <param name="input">@(@Model.BusName)鏌ヨ鍙傛暟</param>
/// <returns>(@Model.BusName)瀹炰緥鍒楄〃</returns>
- [Description("@Model.ClassName/listNonPage")]
- [HttpGet("listNonPage")]
+ [HttpGet("@Model.ClassName/listNonPage")]
public async Task<List<@(@Model.ClassName)Output>> ListNonPageAsync([FromQuery] @(@Model.ClassName)SearchNonPage input)
{
@foreach (var column in Model.TableField)
@@ -196,8 +194,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [Description("@Model.ClassName/detail")]
- [HttpGet("detail")]
+ [HttpGet("@Model.ClassName/detail")]
public async Task<@(@Model.ClassName)Output> Get([FromQuery] Querye@(@Model.ClassName)Input input)
{
@foreach (var column in Model.TableField){
@@ -216,8 +213,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [Description("@Model.ClassName/list")]
- [HttpGet("list")]
+ [HttpGet("@Model.ClassName/list")]
public async Task<List<@(@Model.ClassName)Output>> List([FromQuery] @(@Model.ClassName)Input input)
{
return await _@(@Model.CamelizeClassName)Rep.DetachedEntities.ProjectToType<@(@Model.ClassName)Output>().ToListAsync();
@@ -245,8 +241,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [Description("@Model.ClassName/add")]
- [HttpPost("add")]
+ [HttpPost("@Model.ClassName/add")]
public async Task Add(Add@(@Model.ClassName)Input input)
{
var @(@Model.CamelizeClassName) = input.Adapt<@(@Model.ClassName)>();
@@ -264,8 +259,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [Description("@Model.ClassName/delete")]
- [HttpPost("delete")]
+ [HttpPost("@Model.ClassName/delete")]
public async Task Delete(Delete@(@Model.ClassName)Input input)
{
@foreach (var column in Model.TableField){
@@ -282,8 +276,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [Description("@Model.ClassName/edit")]
- [HttpPost("edit")]
+ [HttpPost("@Model.ClassName/edit")]
public async Task Update(Update@(@Model.ClassName)Input input)
{
var isExist = await _@(@Model.CamelizeClassName)Rep.AnyAsync(u => u.Id == input.Id, false);
@@ -308,8 +301,7 @@
/// </summary>
/// <param name="file">Excel妯℃澘鏂囦欢</param>
/// <returns>瀵煎叆鐨勮褰曟暟</returns>
- [Description("@Model.ClassName/importExcel")]
- [HttpPost("importExcel")]
+ [HttpPost("@Model.ClassName/importExcel")]
public async Task<int> ImportExcelAsync(IFormFile file)
{
int _HeadStartLine = 2;//绗�1琛屾槸璇存槑,绗�2琛屾槸鍒楀悕
@@ -358,8 +350,7 @@
/// </summary>
/// <param name="version">妯℃澘鐗堟湰</param>
/// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- [Description("@Model.ClassName/downloadExcelTemplate")]
- [HttpGet("downloadExcelTemplate")]
+ [HttpGet("@Model.ClassName/downloadExcelTemplate")]
public IActionResult DownloadExcelTemplate([FromQuery] string version)
{
string _path = TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増璺緞 + $"\\@Model.ClassName{TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増鍚嶇О鍚庣紑}.xlsx";
--
Gitblit v1.9.3