From b15f41265e6059136c991f85e77942a6ddb5c7c6 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周二, 23 4月 2024 15:57:36 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/WmsFactoryService.cs | 412 +++++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/ISysEnumDataService.cs | 14
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Dto/WmsFactoryInput.cs | 165 ++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsFactoryImport.xlsx | 0
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/editForm.vue | 111 +++
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue | 463 +++++++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenService.cs | 48
iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsFactoryManage.js | 114 +++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml | 312 ++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Map/WmsFactoryMapper.cs | 18
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/IWmsFactoryService.cs | 22
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/addForm.vue | 94 ++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Dto/WmsFactoryOutput.cs | 57 +
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/SysEnumDataService.cs | 47 +
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/excelForm.vue | 181 +++++
15 files changed, 2,031 insertions(+), 27 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsFactoryManage.js b/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsFactoryManage.js
new file mode 100644
index 0000000..bc8d30c
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsFactoryManage.js
@@ -0,0 +1,114 @@
+锘縤mport { axios } from '@/utils/request'
+
+/**
+ * 鏌ヨ宸ュ巶淇℃伅琛�
+ *
+ * @author ly
+ */
+export function WmsFactoryPage (parameter) {
+ return axios({
+ url: '/WmsFactory/page',
+ method: 'get',
+ params: parameter
+ })
+}
+
+/**
+ * 宸ュ巶淇℃伅琛ㄥ垪琛�
+ *
+ * @author ly
+ */
+export function WmsFactoryList (parameter) {
+ return axios({
+ url: '/WmsFactory/list',
+ method: 'get',
+ params: parameter
+ })
+}
+
+/**
+ * 娣诲姞宸ュ巶淇℃伅琛�
+ *
+ * @author ly
+ */
+export function WmsFactoryAdd (parameter) {
+ return axios({
+ url: '/WmsFactory/add',
+ method: 'post',
+ data: parameter
+ })
+}
+
+/**
+ * 缂栬緫宸ュ巶淇℃伅琛�
+ *
+ * @author ly
+ */
+export function WmsFactoryEdit (parameter) {
+ return axios({
+ url: '/WmsFactory/edit',
+ method: 'post',
+ data: parameter
+ })
+}
+
+/**
+ * 鍒犻櫎宸ュ巶淇℃伅琛�
+ *
+ * @author ly
+ */
+export function WmsFactoryDelete (parameter) {
+ return axios({
+ url: '/WmsFactory/delete',
+ method: 'post',
+ data: parameter
+ })
+}
+
+
+/**
+ * 瀵煎嚭宸ュ巶淇℃伅琛ㄧ殑Excel鏂囦欢
+ *
+ * @author ly
+ */
+export function WmsFactoryToExcel (parameter) {
+ return axios({
+ url: '/WmsFactory/toExcel',
+ method: 'get',
+ params: parameter,
+ responseType: 'blob'
+ })
+}
+
+/**
+ * 瀵煎叆宸ュ巶淇℃伅琛ㄧ殑Excel鏂囦欢
+ *
+ * @author ly
+ */
+export function WmsFactoryImportExcel (data, parameter) {
+ return axios({
+ url: '/WmsFactory/importExcel',
+ method: 'post',
+ data: data,
+ params: parameter
+
+ })
+}
+
+
+/**
+ * 涓嬭浇宸ュ巶淇℃伅琛ㄧ殑Excel瀵煎叆妯℃澘
+ *
+ * @author ly
+ */
+export function WmsFactoryDownloadExcelTemplate(parameter) {
+ return axios({
+ url: '/WmsFactory/downloadExcelTemplate',
+ method: 'get',
+ params: parameter,
+ responseType: 'blob'
+ })
+}
+
+
+
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/addForm.vue
new file mode 100644
index 0000000..bf492da
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/addForm.vue
@@ -0,0 +1,94 @@
+锘�<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="['factoryCode', {rules: [{required: true, message: '璇疯緭鍏ョ紪鍙凤紒'}]}]" />
+ </a-form-item>
+ <a-form-item label="鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ュ悕绉�" v-decorator="['factoryName', {rules: [{required: true, message: '璇疯緭鍏ュ悕绉帮紒'}]}]" />
+ </a-form-item>
+ <a-form-item label="鍦板潃" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ュ湴鍧�" v-decorator="['factoryAddress']" />
+ </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>
+ </a-spin>
+ </a-modal>
+</template>
+
+<script>
+ import moment from 'moment'
+ import {
+ WmsFactoryAdd
+ } from '@/api/modular/main/WmsBase/WmsFactoryManage'
+ 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])
+ }
+ }
+ WmsFactoryAdd(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/WmsFactory/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/editForm.vue
new file mode 100644
index 0000000..ce873f0
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/editForm.vue
@@ -0,0 +1,111 @@
+锘�<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="['factoryCode', {rules: [{required: true, message: '璇疯緭鍏ョ紪鍙凤紒'}]}]" />
+ </a-form-item>
+ <a-form-item label="鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ュ悕绉�" v-decorator="['factoryName', {rules: [{required: true, message: '璇疯緭鍏ュ悕绉帮紒'}]}]" />
+ </a-form-item>
+ <a-form-item label="鍦板潃" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ュ湴鍧�" v-decorator="['factoryAddress']" />
+ </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 v-show="false"><a-input v-decorator="['id']" /></a-form-item>
+ </a-form>
+ </a-spin>
+ </a-modal>
+</template>
+
+<script>
+import moment from 'moment'
+ import {
+ WmsFactoryEdit
+ } from '@/api/modular/main/WmsBase/WmsFactoryManage'
+ 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,
+ factoryCode: record.factoryCode,
+ factoryName: record.factoryName,
+ factoryAddress: record.factoryAddress,
+ isDisabled: record.isDisabled
+ }
+ )
+ })
+ },
+ 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]
+ }
+ }
+ WmsFactoryEdit(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/WmsFactory/excelForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/excelForm.vue
new file mode 100644
index 0000000..85b0b24
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/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="wmsFactoryDownloadExcelTemplate" 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 { WmsFactoryImportExcel, WmsFactoryDownloadExcelTemplate} from '@/api/modular/main/WmsBase/WmsFactoryManage'
+ 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("wmsFactoryDownloadExcelTemplate")
+ window.downloadFile = this.wmsFactoryDownloadExcelTemplate;
+ this.getTable();
+ },
+ showDemand() {
+ this.detailed = !this.detailed;
+ },
+ customRequest(document) {
+ this.uploadFile = document
+ },
+ getTable() {
+ sysExcelTemplateGetColumnList({className: "WmsFactory"}).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)
+ WmsFactoryImportExcel(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
+ },
+ wmsFactoryDownloadExcelTemplate() {
+ WmsFactoryDownloadExcelTemplate({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/WmsFactory/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue
new file mode 100644
index 0000000..db1ae51
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue
@@ -0,0 +1,463 @@
+锘�<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('WmsFactory:page')">
+ <a-form layout="inline">
+ <a-row :gutter="48">
+ <a-col :md="8" :sm="24">
+ <a-form-item label="缂栧彿">
+ <a-input v-model="queryParam.factoryCode" allow-clear placeholder="璇疯緭鍏ョ紪鍙�"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鍚嶇О">
+ <a-input v-model="queryParam.factoryName" allow-clear placeholder="璇疯緭鍏ュ悕绉�"/>
+ </a-form-item>
+ </a-col><template v-if="advanced">
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鍦板潃">
+ <a-input v-model="queryParam.factoryAddress" 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-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('WmsFactory: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('WmsFactory:exportExcel')" icon="download" @click="WmsFactoryToExcel()">
+ 瀵煎嚭
+ </a-button>
+ <a-button type="primary" v-if="hasPerm('WmsFactory: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('WmsFactory:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
+ <a-divider type="vertical" v-if="hasPerm('WmsFactory:edit') & hasPerm('WmsFactory:delete')"/>
+ <a-popconfirm v-if="hasPerm('WmsFactory:delete')" placement="topRight" title="纭鍒犻櫎锛�" @confirm="() => WmsFactoryDelete(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 { WmsFactoryPage, WmsFactoryDelete, WmsFactoryToExcel } from '@/api/modular/main/WmsBase/WmsFactoryManage'
+ //鑷畾涔塼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: 'factoryCode'
+ },
+ {
+ title: '鍚嶇О',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'factoryName'
+ },
+ {
+ title: '鍦板潃',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'factoryAddress'
+ },
+ {
+ 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: '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 WmsFactoryPage(Object.assign(parameter, this.switchingDate())).then((res) => {
+ return res.data
+ })
+ },
+ selectedRowKeys: [],
+ selectedRows: []
+ }
+ },
+ created () {
+ if (this.hasPerm('WmsFactory:edit') || this.hasPerm('WmsFactory: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
+ },
+ WmsFactoryDelete (record) {
+ WmsFactoryDelete(record).then((res) => {
+ if (res.success) {
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.$refs.table.refresh()
+ } else {
+ this.$message.error('鍒犻櫎澶辫触') // + res.message
+ }
+ })
+ },
+
+
+ WmsFactoryToExcel() {
+ 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
+ }
+ })
+ }
+ WmsFactoryPage(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 4b99419..e6bd6dc 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
@@ -4866,7 +4866,7 @@
浠ｇ爜鐢熸垚鍣ㄦ湇鍔�
</summary>
</member>
- <member name="M:Admin.NET.Application.CodeGen.CodeGenerateService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysCodeGen},Furion.DatabaseAccessor.IRepository{Furion.Extras.Admin.NET.Entity.SysLowCode},Admin.NET.Application.ICodeGenConfigService,Furion.ViewEngine.IViewEngine,Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysMenu},Admin.NET.Application.ISysExcelTemplateService)">
+ <member name="M:Admin.NET.Application.CodeGen.CodeGenerateService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysCodeGen},Furion.DatabaseAccessor.IRepository{Furion.Extras.Admin.NET.Entity.SysLowCode},Admin.NET.Application.ICodeGenConfigService,Furion.ViewEngine.IViewEngine,Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysMenu},Admin.NET.Application.ISysEnumDataService)">
<summary>
鏋勯�犲嚱鏁�
</summary>
@@ -4875,6 +4875,7 @@
<param name="codeGenConfigService"></param>
<param name="viewEngine"></param>
<param name="sysMenuRep"></param>
+ <param name="sysEnumDataService"></param>
</member>
<member name="M:Admin.NET.Application.CodeGen.CodeGenerateService.QueryCodeGenPageList(Admin.NET.Application.CodeGenPageInput)">
<summary>
@@ -7117,6 +7118,20 @@
<param name="input"></param>
<returns></returns>
</member>
+ <member name="M:Admin.NET.Application.ISysEnumDataService.GetEnumDataListStrAsync(Admin.NET.Application.EnumDataInput)">
+ <summary>
+ 閫氳繃鏋氫妇绫诲瀷鑾峰彇鏋氫妇鍊煎瓧绗︿覆闆嗗悎
+ </summary>
+ <param name="input"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Admin.NET.Application.ISysEnumDataService.GetEnumDataListStr(Admin.NET.Application.EnumDataInput)">
+ <summary>
+ 閫氳繃鏋氫妇绫诲瀷鑾峰彇鏋氫妇鍊煎瓧绗︿覆闆嗗悎
+ </summary>
+ <param name="input"></param>
+ <returns></returns>
+ </member>
<member name="M:Admin.NET.Application.ISysEnumDataService.GetEnumDataListByField(Admin.NET.Application.QueryEnumDataInput)">
<summary>
@@ -7132,6 +7147,20 @@
<member name="M:Admin.NET.Application.SysEnumDataService.GetEnumDataList(Admin.NET.Application.EnumDataInput)">
<summary>
閫氳繃鏋氫妇绫诲瀷鑾峰彇鏋氫妇鍊奸泦鍚�
+ </summary>
+ <param name="input"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Admin.NET.Application.SysEnumDataService.GetEnumDataListStrAsync(Admin.NET.Application.EnumDataInput)">
+ <summary>
+ 閫氳繃鏋氫妇绫诲瀷鑾峰彇鏋氫妇鍊煎瓧绗︿覆闆嗗悎
+ </summary>
+ <param name="input"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Admin.NET.Application.SysEnumDataService.GetEnumDataListStr(Admin.NET.Application.EnumDataInput)">
+ <summary>
+ 閫氳繃鏋氫妇绫诲瀷鑾峰彇鏋氫妇鍊煎瓧绗︿覆闆嗗悎
</summary>
<param name="input"></param>
<returns></returns>
@@ -15339,6 +15368,287 @@
<param name="Aisle"></param>
<returns></returns>
</member>
+ <member name="T:Admin.NET.Application.WmsFactorySearch">
+ <summary>
+ 宸ュ巶淇℃伅琛ㄦ煡璇㈠弬鏁�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearch.FactoryCode">
+ <summary>
+ 缂栧彿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearch.FactoryName">
+ <summary>
+ 鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearch.FactoryAddress">
+ <summary>
+ 鍦板潃
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearch.IsDisabled">
+ <summary>
+ 鏄惁绂佺敤
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearch.CreatedTime">
+ <summary>
+ 鍒涘缓鏃堕棿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearch.UpdatedTime">
+ <summary>
+ 鏇存柊鏃堕棿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearch.CreatedUserName">
+ <summary>
+ 鍒涘缓鑰呭悕绉�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearch.UpdatedUserName">
+ <summary>
+ 淇敼鑰呭悕绉�
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.WmsFactorySearchNonPage">
+ <summary>
+ 宸ュ巶淇℃伅琛ㄤ笉鍒嗛〉鏌ヨ鍙傛暟
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.FactoryCode">
+ <summary>
+ 缂栧彿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.FactoryName">
+ <summary>
+ 鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.FactoryAddress">
+ <summary>
+ 鍦板潃
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.IsDisabled">
+ <summary>
+ 鏄惁绂佺敤
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.CreatedTime">
+ <summary>
+ 鍒涘缓鏃堕棿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.UpdatedTime">
+ <summary>
+ 鏇存柊鏃堕棿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.CreatedUserName">
+ <summary>
+ 鍒涘缓鑰呭悕绉�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.UpdatedUserName">
+ <summary>
+ 淇敼鑰呭悕绉�
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.WmsFactoryInput">
+ <summary>
+ 宸ュ巶淇℃伅琛ㄨ緭鍏ュ弬鏁�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactoryInput.FactoryCode">
+ <summary>
+ 缂栧彿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactoryInput.FactoryName">
+ <summary>
+ 鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactoryInput.FactoryAddress">
+ <summary>
+ 鍦板潃
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactoryInput.IsDisabled">
+ <summary>
+ 鏄惁绂佺敤
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.AddWmsFactoryInput">
+ <summary>
+ 宸ュ巶淇℃伅琛ㄦ柊澧炲弬鏁�
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.DeleteWmsFactoryInput">
+ <summary>
+ 宸ュ巶淇℃伅琛ㄥ垹闄ゅ弬鏁�
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.UpdateWmsFactoryInput">
+ <summary>
+ 宸ュ巶淇℃伅琛ㄦ洿鏂板弬鏁�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.UpdateWmsFactoryInput.Id">
+ <summary>
+ Id涓婚敭
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.QueryeWmsFactoryInput">
+ <summary>
+ 宸ュ巶淇℃伅琛ㄨ幏鍙栧崟涓弬鏁�
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.WmsFactoryOutput">
+ <summary>
+ 宸ュ巶淇℃伅琛ㄨ緭鍑哄弬鏁�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactoryOutput.FactoryCode">
+ <summary>
+ 缂栧彿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactoryOutput.FactoryName">
+ <summary>
+ 鍚嶇О
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactoryOutput.FactoryAddress">
+ <summary>
+ 鍦板潃
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactoryOutput.IsDisabled">
+ <summary>
+ 鏄惁绂佺敤
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactoryOutput.Id">
+ <summary>
+ Id涓婚敭
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactoryOutput.CreatedTime">
+ <summary>
+ 鍒涘缓鏃堕棿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactoryOutput.UpdatedTime">
+ <summary>
+ 鏇存柊鏃堕棿
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactoryOutput.CreatedUserName">
+ <summary>
+ 鍒涘缓鑰呭悕绉�
+ </summary>
+ </member>
+ <member name="P:Admin.NET.Application.WmsFactoryOutput.UpdatedUserName">
+ <summary>
+ 淇敼鑰呭悕绉�
+ </summary>
+ </member>
+ <member name="T:Admin.NET.Application.WmsFactoryService">
+ <summary>
+ 宸ュ巶淇℃伅琛ㄦ湇鍔�
+ </summary>
+ </member>
+ <member name="M:Admin.NET.Application.WmsFactoryService.Page(Admin.NET.Application.WmsFactorySearch)">
+ <summary>
+ 鍒嗛〉鏌ヨ宸ュ巶淇℃伅琛�
+ </summary>
+ <param name="input"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsFactoryService.ListNonPageAsync(Admin.NET.Application.WmsFactorySearchNonPage)">
+ <summary>
+ 涓嶅垎椤垫煡璇㈠伐鍘備俊鎭〃鍒楄〃
+ </summary>
+ <param name="input">宸ュ巶淇℃伅琛ㄦ煡璇㈠弬鏁�</param>
+ <returns>(宸ュ巶淇℃伅琛�)瀹炰緥鍒楄〃</returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsFactoryService.Get(Admin.NET.Application.QueryeWmsFactoryInput)">
+ <summary>
+ 鑾峰彇宸ュ巶淇℃伅琛�
+ </summary>
+ <param name="input"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsFactoryService.List(Admin.NET.Application.WmsFactoryInput)">
+ <summary>
+ 鑾峰彇宸ュ巶淇℃伅琛ㄥ垪琛�
+ </summary>
+ <param name="input"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsFactoryService.Add(Admin.NET.Application.AddWmsFactoryInput)">
+ <summary>
+ 澧炲姞宸ュ巶淇℃伅琛�
+ </summary>
+ <param name="input"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsFactoryService.Delete(Admin.NET.Application.DeleteWmsFactoryInput)">
+ <summary>
+ 鍒犻櫎宸ュ巶淇℃伅琛�
+ </summary>
+ <param name="input"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsFactoryService.Update(Admin.NET.Application.UpdateWmsFactoryInput)">
+ <summary>
+ 鏇存柊宸ュ巶淇℃伅琛�
+ </summary>
+ <param name="input"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsFactoryService.ImportExcelAsync(Microsoft.AspNetCore.Http.IFormFile)">
+ <summary>
+ Excel妯℃澘瀵煎叆宸ュ巶淇℃伅琛ㄥ姛鑳�
+ </summary>
+ <param name="file">Excel妯℃澘鏂囦欢</param>
+ <returns>瀵煎叆鐨勮褰曟暟</returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsFactoryService.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.WmsFactoryService.DownloadExcelTemplate(System.String)">
+ <summary>
+ 鏍规嵁鐗堟湰涓嬭浇宸ュ巶淇℃伅琛ㄧ殑Excel瀵煎叆妯℃澘
+ </summary>
+ <param name="version">妯℃澘鐗堟湰</param>
+ <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsFactoryService.CheckExisit(Admin.NET.Core.WmsFactory,System.Boolean)">
+ <summary>
+ 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-鏁版嵁搴�
+ </summary>
+ <param name="input"></param>
+ <param name="isEdit"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Admin.NET.Application.WmsFactoryService.CheckExisitForImport(System.Collections.Generic.List{Admin.NET.Core.WmsFactory})">
+ <summary>
+ 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-瀵煎叆鏃堕獙璇�
+ </summary>
+ <param name="inputs"></param>
+ <returns></returns>
+ </member>
<member name="T:Admin.NET.Application.WmsMaterialSearch">
<summary>
鐗╂枡淇℃伅琛ㄦ煡璇㈠弬鏁�
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenService.cs
index f1aa40d..9760a98 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenService.cs
@@ -16,23 +16,11 @@
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Newtonsoft.Json;
-using OfficeOpenXml.Drawing;
using OfficeOpenXml;
-using System;
+using StackExchange.Profiling.Internal;
+using System.Reflection;
using System.Text;
using System.Web;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
-using OfficeOpenXml.Style;
-using System.Net.WebSockets;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using System.Reflection;
-using NetTopologySuite.Noding;
-using System.Xml.Linq;
-using static Npgsql.Replication.PgOutput.Messages.RelationMessage;
-using StackExchange.Profiling.Internal;
-using System.Collections.Generic;
-using System.Data.SqlTypes;
namespace Admin.NET.Application.CodeGen
{
@@ -47,7 +35,7 @@
private readonly IRepository<SysLowCode> _sysLowCodeRep; // 浠ｇ爜鐢熸垚鍣ㄤ粨鍌�
private readonly ICodeGenConfigService _codeGenConfigService;
private readonly IViewEngine _viewEngine;
- private readonly ISysExcelTemplateService _sysExcelTemplateService;
+ private readonly ISysEnumDataService _sysEnumDataService;
private readonly IRepository<SysMenu> _sysMenuRep; // 鑿滃崟琛ㄤ粨鍌�
/// <summary>
@@ -58,19 +46,20 @@
/// <param name="codeGenConfigService"></param>
/// <param name="viewEngine"></param>
/// <param name="sysMenuRep"></param>
+ /// <param name="sysEnumDataService"></param>
public CodeGenerateService(IRepository<SysCodeGen> sysCodeGenRep,
IRepository<SysLowCode> sysLowCodeRep,
ICodeGenConfigService codeGenConfigService,
IViewEngine viewEngine,
IRepository<SysMenu> sysMenuRep,
- ISysExcelTemplateService sysExcelTemplateService)
+ ISysEnumDataService sysEnumDataService)
{
_sysCodeGenRep = sysCodeGenRep;
_sysLowCodeRep = sysLowCodeRep;
_codeGenConfigService = codeGenConfigService;
_viewEngine = viewEngine;
_sysMenuRep = sysMenuRep;
- _sysExcelTemplateService = sysExcelTemplateService;
+ _sysEnumDataService = sysEnumDataService;
}
/// <summary>
@@ -1041,6 +1030,7 @@
//鑾峰彇瑕佸鐞嗙殑浠ｇ爜鐢熸垚閰嶇疆鐨勬槸澧炴敼鐨勬ā鐗堝瓧娈�
var showCodeGenConfigs = tableFieldList.Where(w => w.WhetherAddUpdate.Equals("Y")).ToList();
+ showCodeGenConfigs = showCodeGenConfigs.Where(x => x.ColumnKey.ToLower() == "false").ToList();
int _mergeCellsCount = showCodeGenConfigs.Count();//鍚堝苟鍒楋紙妯＄増璧嬪�肩殑鏍囬鍒楁暟锛�
//鑾峰彇蹇呭～瀛楁
@@ -1102,26 +1092,26 @@
StringBuilder _remarkContentBuilder = new StringBuilder();
_remarkContentBuilder.AppendLine("");
_remarkContentBuilder.AppendLine("1.鏀寔Excel2007鍙婁互涓婄増鏈枃浠躲��");
- _remarkContentBuilder.AppendLine("2.瀵煎叆鏂板鏁版嵁鏃朵笉鑳借秴杩�5000琛屻��");
- _remarkContentBuilder.AppendLine("3.瀵煎叆鏇存柊鏁版嵁鏃朵笉鑳借秴杩�2000琛屻��");
+ _remarkContentBuilder.AppendLine("2.瀵煎叆鏁版嵁鏃朵笉鑳借秴杩�5000琛屻��");
_remarkContentBuilder.AppendLine("");
_remarkContentBuilder.AppendLine("");
Dictionary<string, string> typeNameDict = new()
{
- { "string", "鏂囨湰銆�"},
- { "int", "鏁板瓧銆�"},
- { "long", "鏁板瓧銆�"},
- { "decimal", "灏忔暟銆�"},
- { "bool", "甯冨皵銆傜ず渚嬶細鏄�佸惁銆�"},
+ { "string", "杈撳叆鏂囨湰銆�"},
+ { "int", "杈撳叆鏁板瓧銆�"},
+ { "long", "杈撳叆鏁板瓧銆�"},
+ { "decimal", "杈撳叆灏忔暟銆�"},
+ { "bool", "鏄�,鍚︺��"},
};
Dictionary<string, string> effectTypeDict = new()
{
- { "datepicker", "鏃ユ湡銆� 绀轰緥: 2023/3/1"},
- { "datetimepicker", "鏃ユ湡鏃堕棿銆傜ず渚�: 2023/3/1 12:00:00"},
+ { "datepicker", "鏃ユ湡銆� 绀轰緥: 2023/3/1銆�"},
+ { "datetimepicker", "鏃ユ湡鏃堕棿銆傜ず渚�: 2023/3/1 12:00:00銆�"},
};
+
requiredTableFieldList.ForEach(x =>
{
string text = "";
@@ -1134,6 +1124,12 @@
{
text += typeNameDict[x.DtoNetType];
}
+ else if (x.EffectType == "select")
+ {
+ var queryValue = x.DtoNetType.Split('.').Last();
+ var enumStr = _sysEnumDataService.GetEnumDataListStr(new EnumDataInput() { EnumName = queryValue });
+ text += enumStr + "銆�";
+ }
else
{
text += ("娉ㄦ剰锛氱被鍨嬫湭鑳借瘑鍒嚭鏉ワ紝闇�瑕佽嚜宸辩淮鎶わ紒锛侊紒銆�");
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/ISysEnumDataService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/ISysEnumDataService.cs
index c864261..5d65b99 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/ISysEnumDataService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/ISysEnumDataService.cs
@@ -15,6 +15,20 @@
Task<dynamic> GetEnumDataList([FromQuery] EnumDataInput input);
/// <summary>
+ /// 閫氳繃鏋氫妇绫诲瀷鑾峰彇鏋氫妇鍊煎瓧绗︿覆闆嗗悎
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ Task<string> GetEnumDataListStrAsync([FromQuery] EnumDataInput input);
+
+ /// <summary>
+ /// 閫氳繃鏋氫妇绫诲瀷鑾峰彇鏋氫妇鍊煎瓧绗︿覆闆嗗悎
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ string GetEnumDataListStr([FromQuery] EnumDataInput input);
+
+ /// <summary>
///
/// </summary>
/// <param name="input"></param>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/SysEnumDataService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/SysEnumDataService.cs
index ac6653f..33c491a 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/SysEnumDataService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/SysEnumDataService.cs
@@ -6,6 +6,7 @@
using Furion.FriendlyException;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using System.Linq;
namespace Admin.NET.Application
{
@@ -41,6 +42,52 @@
}
/// <summary>
+ /// 閫氳繃鏋氫妇绫诲瀷鑾峰彇鏋氫妇鍊煎瓧绗︿覆闆嗗悎
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet("sysEnumData/getEnumDataListStrAsync")]
+ public async Task<string> GetEnumDataListStrAsync([FromQuery] EnumDataInput input)
+ {
+ // 鏌ユ壘鏋氫妇
+ var enumType = App.EffectiveTypes.FirstOrDefault(t => t.IsEnum && t.Name == input.EnumName);
+ if (enumType == null)
+ throw Oops.Oh(ErrorCode.D1502).StatusCode(405);
+
+ // 鑾峰彇鏋氫妇鐨凨ey鍜屾弿杩�
+ List<EnumDataOutput> retList = await Task.Run(() => EnumUtil.GetEnumDescDictionary(enumType)
+ .Select(x => new EnumDataOutput
+ {
+ Code = x.Key,
+ Value = x.Value
+ }).ToList());
+ return string.Join(",", retList.Select(x => x.Value).ToList());
+ }
+
+ /// <summary>
+ /// 閫氳繃鏋氫妇绫诲瀷鑾峰彇鏋氫妇鍊煎瓧绗︿覆闆嗗悎
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet("sysEnumData/getEnumDataListStr")]
+ public string GetEnumDataListStr([FromQuery] EnumDataInput input)
+ {
+ // 鏌ユ壘鏋氫妇
+ var enumType = App.EffectiveTypes.FirstOrDefault(t => t.IsEnum && t.Name == input.EnumName);
+ if (enumType == null)
+ throw Oops.Oh(ErrorCode.D1502).StatusCode(405);
+
+ // 鑾峰彇鏋氫妇鐨凨ey鍜屾弿杩�
+ List<EnumDataOutput> retList = EnumUtil.GetEnumDescDictionary(enumType)
+ .Select(x => new EnumDataOutput
+ {
+ Code = x.Key,
+ Value = x.Value
+ }).ToList();
+ return string.Join(",", retList.Select(x => x.Value).ToList());
+ }
+
+ /// <summary>
/// 閫氳繃瀹炰綋瀛楁绫诲瀷鑾峰彇鐩稿叧闆嗗悎锛堢洰鍓嶄粎鏀寔鏋氫妇绫诲瀷锛�
/// </summary>
/// <param name="input"></param>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Dto/WmsFactoryInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Dto/WmsFactoryInput.cs
new file mode 100644
index 0000000..8d753ba
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Dto/WmsFactoryInput.cs
@@ -0,0 +1,165 @@
+锘縰sing Admin.NET.Core;
+using Admin.NET.Core.Service;
+using System.ComponentModel.DataAnnotations;
+
+namespace Admin.NET.Application
+{
+
+ /// <summary>
+ /// 宸ュ巶淇℃伅琛ㄦ煡璇㈠弬鏁�
+ /// </summary>
+ public class WmsFactorySearch : PageInputBase
+ {
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public virtual string FactoryCode { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public virtual string FactoryName { get; set; }
+
+ /// <summary>
+ /// 鍦板潃
+ /// </summary>
+ public virtual string FactoryAddress { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public virtual bool? IsDisabled { 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 WmsFactorySearchNonPage : PageInputNonPageBase
+ {
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public virtual string FactoryCode { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public virtual string FactoryName { get; set; }
+
+ /// <summary>
+ /// 鍦板潃
+ /// </summary>
+ public virtual string FactoryAddress { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public virtual bool? IsDisabled { 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 WmsFactoryInput
+ {
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ [Required(ErrorMessage = "缂栧彿涓嶈兘涓虹┖")]
+ public virtual string FactoryCode { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ [Required(ErrorMessage = "鍚嶇О涓嶈兘涓虹┖")]
+ public virtual string FactoryName { get; set; }
+
+ /// <summary>
+ /// 鍦板潃
+ /// </summary>
+ public virtual string FactoryAddress { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public virtual bool? IsDisabled { get; set; }
+
+ }
+
+ /// <summary>
+ /// 宸ュ巶淇℃伅琛ㄦ柊澧炲弬鏁�
+ /// </summary>
+ public class AddWmsFactoryInput : WmsFactoryInput
+ {
+ }
+
+ /// <summary>
+ /// 宸ュ巶淇℃伅琛ㄥ垹闄ゅ弬鏁�
+ /// </summary>
+ public class DeleteWmsFactoryInput : BaseId
+ {
+ }
+
+ /// <summary>
+ /// 宸ュ巶淇℃伅琛ㄦ洿鏂板弬鏁�
+ /// </summary>
+ public class UpdateWmsFactoryInput : WmsFactoryInput
+ {
+ /// <summary>
+ /// Id涓婚敭
+ /// </summary>
+ [Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
+ public long? Id { get; set; }
+
+ }
+
+ /// <summary>
+ /// 宸ュ巶淇℃伅琛ㄨ幏鍙栧崟涓弬鏁�
+ /// </summary>
+ public class QueryeWmsFactoryInput : BaseId
+ {
+
+ }
+}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Dto/WmsFactoryOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Dto/WmsFactoryOutput.cs
new file mode 100644
index 0000000..80c0b11
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Dto/WmsFactoryOutput.cs
@@ -0,0 +1,57 @@
+锘縰sing Admin.NET.Core.Util.LowCode.Dto;
+using System;
+
+namespace Admin.NET.Application
+{
+ /// <summary>
+ /// 宸ュ巶淇℃伅琛ㄨ緭鍑哄弬鏁�
+ /// </summary>
+ public class WmsFactoryOutput
+ {
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public string FactoryCode { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string FactoryName { get; set; }
+
+ /// <summary>
+ /// 鍦板潃
+ /// </summary>
+ public string FactoryAddress { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public bool? IsDisabled { 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/WmsFactory/IWmsFactoryService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/IWmsFactoryService.cs
new file mode 100644
index 0000000..508aae2
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/IWmsFactoryService.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 IWmsFactoryService
+ {
+ Task<WmsFactoryOutput> Get([FromQuery] QueryeWmsFactoryInput input);
+ Task<List<WmsFactoryOutput>> List([FromQuery] WmsFactoryInput input);
+ Task<PageResult<WmsFactoryOutput>> Page([FromQuery] WmsFactorySearch input);
+ Task<List<WmsFactoryOutput>> ListNonPageAsync([FromQuery] WmsFactorySearchNonPage input);
+
+ Task Add(AddWmsFactoryInput input);
+ Task Update(UpdateWmsFactoryInput input);
+ Task Delete(DeleteWmsFactoryInput 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/WmsFactory/Map/WmsFactoryMapper.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Map/WmsFactoryMapper.cs
new file mode 100644
index 0000000..ba07e4c
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Map/WmsFactoryMapper.cs
@@ -0,0 +1,18 @@
+锘縰sing Mapster;
+using Admin.NET.Core;
+
+namespace Admin.NET.Application
+{
+ public class WmsFactoryMapper : IRegister
+ {
+ public void Register(TypeAdapterConfig config)
+ {
+ config.ForType<AddWmsFactoryInput, WmsFactory>()
+ ;
+ config.ForType<UpdateWmsFactoryInput, WmsFactory>()
+ ;
+ config.ForType<WmsFactory, WmsFactoryOutput>()
+ ;
+ }
+ }
+}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/WmsFactoryService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/WmsFactoryService.cs
new file mode 100644
index 0000000..5a5328b
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/WmsFactoryService.cs
@@ -0,0 +1,412 @@
+锘縰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 = "WmsFactory", Order = 100)]
+ [Route("api")]
+ public class WmsFactoryService : IWmsFactoryService, IDynamicApiController, ITransient
+ {
+ private readonly IRepository<WmsFactory,MasterDbContextLocator> _wmsFactoryRep;
+ private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
+ private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
+ private readonly ISysExcelTemplateService _sysExcelTemplateService;
+ private readonly static object _lock = new();
+
+ public WmsFactoryService(
+ IRepository<WmsFactory,MasterDbContextLocator> wmsFactoryRep
+ ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
+ ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
+ ,ISysExcelTemplateService sysExcelTemplateService
+ )
+ {
+ _wmsFactoryRep = wmsFactoryRep;
+ _sysDictTypeRep = sysDictTypeRep;
+ _sysDictDataRep = sysDictDataRep;
+ _sysExcelTemplateService = sysExcelTemplateService;
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ宸ュ巶淇℃伅琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet("WmsFactory/page")]
+ public async Task<PageResult<WmsFactoryOutput>> Page([FromQuery] WmsFactorySearch input)
+ {
+ var wmsFactorys = await _wmsFactoryRep.DetachedEntities
+ .Where(!string.IsNullOrEmpty(input.FactoryCode), u => u.FactoryCode == input.FactoryCode)
+ .Where(!string.IsNullOrEmpty(input.FactoryName), u => EF.Functions.Like(u.FactoryName, $"%{input.FactoryName.Trim()}%"))
+ .Where(!string.IsNullOrEmpty(input.FactoryAddress), u => u.FactoryAddress == input.FactoryAddress)
+ .Where(input.IsDisabled != null, u => u.IsDisabled == input.IsDisabled)
+ .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<WmsFactorySearch>(input))
+ .ProjectToType<WmsFactoryOutput>()
+ .ToADPagedListAsync(input.PageNo, input.PageSize);
+ return wmsFactorys;
+ }
+
+ /// <summary>
+ /// 涓嶅垎椤垫煡璇㈠伐鍘備俊鎭〃鍒楄〃
+ /// </summary>
+ /// <param name="input">宸ュ巶淇℃伅琛ㄦ煡璇㈠弬鏁�</param>
+ /// <returns>(宸ュ巶淇℃伅琛�)瀹炰緥鍒楄〃</returns>
+ [HttpGet("WmsFactory/listNonPage")]
+ public async Task<List<WmsFactoryOutput>> ListNonPageAsync([FromQuery] WmsFactorySearchNonPage input)
+ {
+ var pFactoryCode = input.FactoryCode?.Trim() ?? "";
+ var pFactoryName = input.FactoryName?.Trim() ?? "";
+ var pFactoryAddress = input.FactoryAddress?.Trim() ?? "";
+ var pIsDisabled = input.IsDisabled;
+ var pCreatedTime = input.CreatedTime;
+ var pUpdatedTime = input.UpdatedTime;
+ var pCreatedUserName = input.CreatedUserName?.Trim() ?? "";
+ var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
+ var wmsFactorys = await _wmsFactoryRep.DetachedEntities
+ .Where(!string.IsNullOrEmpty(pFactoryCode), u => u.FactoryCode == pFactoryCode)
+ .Where(!string.IsNullOrEmpty(pFactoryName), u => EF.Functions.Like(u.FactoryName, $"%{pFactoryName}%"))
+ .Where(!string.IsNullOrEmpty(pFactoryAddress), u => u.FactoryAddress == pFactoryAddress)
+ .Where(pIsDisabled != null, u => u.IsDisabled == pIsDisabled)
+ .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<WmsFactoryOutput>()
+ .ToListAsync();
+ return wmsFactorys;
+ }
+
+ /// <summary>
+ /// 鑾峰彇宸ュ巶淇℃伅琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet("WmsFactory/detail")]
+ public async Task<WmsFactoryOutput> Get([FromQuery] QueryeWmsFactoryInput input)
+ {
+ return (await _wmsFactoryRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsFactoryOutput>();
+ }
+
+ /// <summary>
+ /// 鑾峰彇宸ュ巶淇℃伅琛ㄥ垪琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet("WmsFactory/list")]
+ public async Task<List<WmsFactoryOutput>> List([FromQuery] WmsFactoryInput input)
+ {
+ return await _wmsFactoryRep.DetachedEntities.ProjectToType<WmsFactoryOutput>().ToListAsync();
+ }
+
+ #region 澧炪�佸垹銆佹敼
+
+ /// <summary>
+ /// 澧炲姞宸ュ巶淇℃伅琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost("WmsFactory/add")]
+ public async Task Add(AddWmsFactoryInput input)
+ {
+ var wmsFactory = input.Adapt<WmsFactory>();
+ //楠岃瘉
+ await CheckExisit(wmsFactory);
+
+ wmsFactory.CreatedUserId = wmsFactory.UpdatedUserId = SysHelper.GetUserId();
+ wmsFactory.CreatedUserName = wmsFactory.UpdatedUserName = SysHelper.GetUserName();
+ wmsFactory.CreatedTime = wmsFactory.UpdatedTime = SysHelper.GetNowTime();
+ await _wmsFactoryRep.InsertAsync(wmsFactory);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎宸ュ巶淇℃伅琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost("WmsFactory/delete")]
+ public async Task Delete(DeleteWmsFactoryInput input)
+ {
+ var wmsFactory = await _wmsFactoryRep.FirstOrDefaultAsync(u => u.Id == input.Id);
+ await _wmsFactoryRep.DeleteAsync(wmsFactory);
+
+ }
+
+ /// <summary>
+ /// 鏇存柊宸ュ巶淇℃伅琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost("WmsFactory/edit")]
+ public async Task Update(UpdateWmsFactoryInput input)
+ {
+ var isExist = await _wmsFactoryRep.AnyAsync(u => u.Id == input.Id, false);
+ if (!isExist) throw Oops.Oh(ErrorCode.D1002);
+
+ var wmsFactory = input.Adapt<WmsFactory>();
+ //楠岃瘉
+ await CheckExisit(wmsFactory,true);
+
+ wmsFactory.UpdatedUserId = SysHelper.GetUserId();
+ wmsFactory.UpdatedUserName = SysHelper.GetUserName();
+ wmsFactory.UpdatedTime = SysHelper.GetNowTime();
+ await _wmsFactoryRep.UpdateAsync(wmsFactory,ignoreNullValues:true);
+ }
+
+ #endregion
+
+ #region 瀵煎叆
+
+ /// <summary>
+ /// Excel妯℃澘瀵煎叆宸ュ巶淇℃伅琛ㄥ姛鑳�
+ /// </summary>
+ /// <param name="file">Excel妯℃澘鏂囦欢</param>
+ /// <returns>瀵煎叆鐨勮褰曟暟</returns>
+ [HttpPost("WmsFactory/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)
+ {
+ _wmsFactoryRep.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<WmsFactory>> CommonImport(DataTable dataTable, int dataStartLine)
+ {
+
+ var details = new List<WmsFactory>();
+ int index = dataStartLine;//妯＄増鍒楀悕寮�濮嬭
+ foreach (System.Data.DataRow row in dataTable.Rows)
+ {
+ index++;
+
+ //瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
+
+ var addItem = new WmsFactory()
+ {
+ CreatedTime = SysHelper.GetNowTime(),
+ CreatedUserId = SysHelper.GetUserId(),
+ CreatedUserName = SysHelper.GetUserName(),
+ UpdatedTime = SysHelper.GetNowTime(),
+ UpdatedUserId = SysHelper.GetUserId(),
+ UpdatedUserName = SysHelper.GetUserName()
+ };
+ #region 瀹氫箟鍙橀噺
+ var _FactoryCode = "";//缂栧彿
+ var _FactoryName = "";//鍚嶇О
+ var _FactoryAddress = "";//鍦板潃
+ var _IsDisabled = "";//鏄惁绂佺敤
+ var _Id = "";//Id涓婚敭
+ #endregion
+
+
+ #region 鍙栧��
+ _FactoryCode = row["缂栧彿"]?.ToString() ;
+ _FactoryName = row["鍚嶇О"]?.ToString() ;
+ _FactoryAddress = row["鍦板潃"]?.ToString() ;
+ _IsDisabled = row["鏄惁绂佺敤"]?.ToString() ;
+ _Id = row["Id涓婚敭"]?.ToString() ;
+ #endregion
+
+
+ #region 楠岃瘉
+
+ if (string.IsNullOrEmpty(_FactoryCode))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾缂栧彿]{_FactoryCode}涓嶈兘涓虹┖锛�");
+ }
+
+ if(!string.IsNullOrEmpty(_FactoryCode))
+ {
+ addItem.FactoryCode = (string)_FactoryCode;
+ }
+
+ if (string.IsNullOrEmpty(_FactoryName))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鍚嶇О]{_FactoryName}涓嶈兘涓虹┖锛�");
+ }
+
+ if(!string.IsNullOrEmpty(_FactoryName))
+ {
+ addItem.FactoryName = (string)_FactoryName;
+ }
+ if(!string.IsNullOrEmpty(_FactoryAddress))
+ {
+ addItem.FactoryAddress = (string)_FactoryAddress;
+ }
+ 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(_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("WmsFactory/downloadExcelTemplate")]
+ public IActionResult DownloadExcelTemplate([FromQuery] string version)
+ {
+ string _path = TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増璺緞 + $"\\WmsFactory{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( WmsFactory input,bool isEdit=false)
+ {
+
+
+
+ bool isExist = false;
+ if (!isEdit)//鏂板
+ {
+ //鏁版嵁鏄惁瀛樺湪閲嶅
+ isExist = await _wmsFactoryRep.AnyAsync(u =>
+ u.FactoryCode.Equals(input.FactoryCode)
+ ,false);
+ }
+ else//缂栬緫
+ {
+
+
+
+ //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
+ isExist = await _wmsFactoryRep.AnyAsync(u =>
+ u.Id != input.Id
+ &&u.FactoryCode.Equals(input.FactoryCode)
+ ,false);
+ }
+
+
+
+ if (isExist) throw Oops.Oh(ErrorCode.E0001);
+ }
+
+ /// <summary>
+ /// 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-瀵煎叆鏃堕獙璇�
+ /// </summary>
+ /// <param name="inputs"></param>
+ /// <returns></returns>
+ private async Task CheckExisitForImport(List<WmsFactory> inputs)
+ {
+ //鏍规嵁鑱斿悎涓婚敭楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏁版嵁鏄惁閲嶅
+ var existExcelItem = inputs.GroupBy(g => new {
+ g.FactoryCode
+ })
+ .Where(g => g.Count() > 1)
+ .Select(s => new {
+ s.Key.FactoryCode
+ }).FirstOrDefault();
+ if (existExcelItem != null)
+ {
+ var wmsFactory = existExcelItem.Adapt<WmsFactory>();
+ var item= existExcelItem.Adapt<WmsFactory>();
+ throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,缂栧彿[{item.FactoryCode}]宸插瓨鍦�");
+ }
+
+
+
+
+ //鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+ var existDBItem = await _wmsFactoryRep.DetachedEntities.FirstOrDefaultAsync(w=>
+ inputs.Select(s=>""
+ +s.FactoryCode
+ )
+ .Contains(""
+ +w.FactoryCode
+ ));
+ if (existDBItem != null)
+ {
+ var wmsFactory = existExcelItem.Adapt<WmsFactory>();
+ var item= existExcelItem.Adapt<WmsFactory>();
+ throw Oops.Oh($"绯荤粺涓�,缂栧彿[{item.FactoryCode}]宸插瓨鍦�");
+ }
+ }
+
+ #endregion
+ }
+}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsFactoryImport.xlsx b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsFactoryImport.xlsx
new file mode 100644
index 0000000..238ea9a
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsFactoryImport.xlsx
Binary files differ
--
Gitblit v1.9.3