#
Junjie
2024-07-09 3234f42957aa99a4e733580f40e3999b6eed1cd6
#
3个文件已修改
9个文件已添加
930 ■■■■■ 已修改文件
zy-asrs-admin/src/assets/main.css 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-admin/src/views/asrs/matFieldValue/edit.vue 232 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-admin/src/views/asrs/matFieldValue/index.vue 220 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java 61 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatFieldValueController.java 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/MatFieldValue.java 234 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/MatFieldValueMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/MatFieldValueService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MatFieldValueServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/matFieldValue.sql 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/resources/mapper/asrs/MatFieldValueMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-admin/src/assets/main.css
@@ -11,7 +11,7 @@
  padding: 0 6px;
  cursor: pointer;
  transition: color 0.3s;
  color: #000000;
  color: #333333;
}
.trigger:hover {
@@ -23,7 +23,7 @@
}
.active:hover {
  color: #000000 !important;
  color: #333333 !important;
}
.logo {
@@ -49,7 +49,7 @@
.header-top-right {
  margin-right: 20px;
  color: #000000;
  color: #333333;
  cursor: pointer;
  user-select: none;
  flex: 4;
@@ -66,7 +66,7 @@
  display: flex;
  justify-content: center;
  align-items: center;
  color: #000000;
  color: #333333;
  cursor: pointer;
  user-select: none;
}
zy-asrs-admin/src/views/asrs/matFieldValue/edit.vue
New file
@@ -0,0 +1,232 @@
<script setup>
import { ref, nextTick } from 'vue';
import { get, post, postBlob, postForm } from '@/utils/request.js'
import { formatMessage } from '@/utils/localeUtils.js';
import { message } from 'ant-design-vue';
const formTable = ref(null);
const submitButton = ref(null);
const isSave = ref(true);
const open = ref(false);
const initFormData = {}
let formData = ref(initFormData);
const emit = defineEmits(['tableReload'])
const handleOk = (e) => {
    nextTick(() => {
        setTimeout(() => {
            submitButton.value.$el.click();
        }, 100);
    });
};
const onFinish = values => {
    // console.log('Success:', values);
    open.value = false;
    post(isSave.value ? '/api/matFieldValue/save' : '/api/matFieldValue/update', formData.value).then((resp) => {
        let result = resp.data;
        if (result.code === 200) {
            message.success(isSave.value ? formatMessage('page.add.success', '新增成功') : formatMessage('page.update.success', '更新成功'));
        } else {
            message.error(result.msg);
        }
        emit('tableReload', 'reload')
        nextTick(() => {
            formTable.value.resetFields()
        })
    })
};
const onFinishFailed = errorInfo => {
    console.log('Failed:', errorInfo);
};
const matFieldQueryList = ref(null);
matFieldQuery();
function matFieldQuery() {
    postForm('/api/matField/query', {}).then(resp => {
        let result = resp.data;
        matFieldQueryList.value = result.data;
    })
}
const matQueryList = ref(null);
matQuery();
function matQuery() {
    postForm('/api/mat/query', {}).then(resp => {
        let result = resp.data;
        matQueryList.value = result.data;
    })
}
const userQueryList = ref(null);
userQuery();
function userQuery() {
    postForm('/api/user/query', {}).then(resp => {
        let result = resp.data;
        userQueryList.value = result.data;
    })
}
defineExpose({
    open,
    formData,
    initFormData,
    isSave,
})
</script>
<script>
export default {
    name: '商品属性扩展值-edit'
}
</script>
<template>
    <div>
        <a-modal v-model:open="open"
            :title="isSave ? formatMessage('page.add', '添加') : formatMessage('page.edit', '编辑')" @ok="handleOk"
            style="width: 600px;">
            <a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }"
                style="display: flex;justify-content: space-between;flex-wrap: wrap;" autocomplete="off"
                @finish="onFinish" @finishFailed="onFinishFailed">
                    <a-form-item
                      :label="formatMessage('db.man_mat_field_value.name', '字段名') "
                      name="name"
                      style="width: 250px;"
                            >
                    <a-input
                        v-model:value="formData.name"
                     />
                        </a-form-item>
                    <a-form-item
                      :label="formatMessage('db.man_mat_field_value.field_id', '字段') "
                      name="fieldId"
                      style="width: 250px;"
                            >
                    <a-select
                        v-model:value="formData.fieldId"
                        :placeholder="formatMessage('common.select', '请选择')"
                        style="width: 100%"
                        show-search
                        :options="matFieldQueryList"
                        optionFilterProp="label"
                        optionLabelProp="label"
                     >
                    </a-select>
                        </a-form-item>
                    <a-form-item
                      :label="formatMessage('db.man_mat_field_value.mat_id', '物料') "
                      name="matId"
                      style="width: 250px;"
                            >
                    <a-select
                        v-model:value="formData.matId"
                        :placeholder="formatMessage('common.select', '请选择')"
                        style="width: 100%"
                        show-search
                        :options="matQueryList"
                        optionFilterProp="label"
                        optionLabelProp="label"
                     >
                    </a-select>
                        </a-form-item>
                    <a-form-item
                      :label="formatMessage('db.man_mat_field_value.value', '参数值') "
                      name="value"
                      style="width: 250px;"
                            >
                    <a-input
                        v-model:value="formData.value"
                     />
                        </a-form-item>
                    <a-form-item
                      :label="formatMessage('db.man_mat_field_value.status', '状态') "
                      name="status"
                      style="width: 250px;"
                            >
                    <a-select
                        v-model:value="formData.status"
                        :options="[
                                { label: '正常', value: 1 },
                                { label: '禁用', value: 0 },
                            ]"
                        >
                    </a-select>
                        </a-form-item>
                    <a-form-item
                      :label="formatMessage('db.man_mat_field_value.create_time', '添加时间') "
                      name="createTime"
                      style="width: 250px;"
                            >
                    <a-date-picker
                        v-model:value="formData.createTime"
                        show-time
                        format="YYYY-MM-DD HH:mm:ss"
                        value-format="YYYY-MM-DD HH:mm:ss"
                     />
                        </a-form-item>
                    <a-form-item
                      :label="formatMessage('db.man_mat_field_value.create_by', '添加人员') "
                      name="createBy"
                      style="width: 250px;"
                            >
                    <a-select
                        v-model:value="formData.createBy"
                        :placeholder="formatMessage('common.select', '请选择')"
                        style="width: 100%"
                        show-search
                        :options="userQueryList"
                        optionFilterProp="label"
                        optionLabelProp="label"
                     >
                    </a-select>
                        </a-form-item>
                    <a-form-item
                      :label="formatMessage('db.man_mat_field_value.update_time', '修改时间') "
                      name="updateTime"
                      style="width: 250px;"
                            >
                    <a-date-picker
                        v-model:value="formData.updateTime"
                        show-time
                        format="YYYY-MM-DD HH:mm:ss"
                        value-format="YYYY-MM-DD HH:mm:ss"
                     />
                        </a-form-item>
                    <a-form-item
                      :label="formatMessage('db.man_mat_field_value.update_by', '修改人员') "
                      name="updateBy"
                      style="width: 250px;"
                            >
                    <a-select
                        v-model:value="formData.updateBy"
                        :placeholder="formatMessage('common.select', '请选择')"
                        style="width: 100%"
                        show-search
                        :options="userQueryList"
                        optionFilterProp="label"
                        optionLabelProp="label"
                     >
                    </a-select>
                        </a-form-item>
                    <a-form-item
                      :label="formatMessage('db.man_mat_field_value.memo', '备注') "
                      name="memo"
                      style="width: 250px;"
                            >
                    <a-input
                        v-model:value="formData.memo"
                     />
                        </a-form-item>
                <a-form-item>
                    <a-button type="primary" html-type="submit" ref="submitButton"
                        style="visibility: hidden;">Submit</a-button>
                </a-form-item>
            </a-form>
        </a-modal>
    </div>
</template>
<style></style>
zy-asrs-admin/src/views/asrs/matFieldValue/index.vue
New file
@@ -0,0 +1,220 @@
<script setup>
import { getCurrentInstance, ref, computed, reactive } from 'vue';
import { useRouter } from "vue-router";
import { get, post, postBlob } from '@/utils/request.js'
import { message, Modal } from 'ant-design-vue';
import { logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
const TABLE_KEY = 'table-matFieldValue';
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
const editChild = ref(null)
let tableData = ref([]);
getPage();
const columns = [
        {
            title: formatMessage('db.man_mat_field_value.name', '字段名'),
            dataIndex: 'name',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.man_mat_field_value.field_id', '字段'),
            dataIndex: 'fieldId$',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.man_mat_field_value.mat_id', '物料'),
            dataIndex: 'matId$',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.man_mat_field_value.value', '参数值'),
            dataIndex: 'value',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.man_mat_field_value.status', '状态'),
            dataIndex: 'status$',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.man_mat_field_value.create_time', '添加时间'),
            dataIndex: 'createTime$',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.man_mat_field_value.create_by', '添加人员'),
            dataIndex: 'createBy$',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.man_mat_field_value.update_time', '修改时间'),
            dataIndex: 'updateTime$',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.man_mat_field_value.update_by', '修改人员'),
            dataIndex: 'updateBy$',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.man_mat_field_value.memo', '备注'),
            dataIndex: 'memo',
            width: 140,
            ellipsis: true,
        },
  {
    title: formatMessage('common.operation', '操作'),
    name: 'oper',
    dataIndex: 'oper',
    key: 'oper',
    width: 140,
  },
];
const state = reactive({
  selectedRowKeys: [],
  loading: false,
});
const hasSelected = computed(() => state.selectedRowKeys.length > 0);
const start = () => {
  state.loading = true;
  // ajax request after empty completing
  setTimeout(() => {
    state.loading = false;
    state.selectedRowKeys = [];
  }, 1000);
};
const onSelectChange = selectedRowKeys => {
  // console.log('selectedRowKeys changed: ', selectedRowKeys);
  state.selectedRowKeys = selectedRowKeys;
};
function getPage() {
  post('/api/matFieldValue/page', {
    current: currentPage,
    pageSize: pageSize,
    condition: searchInput.value
  }).then((resp) => {
    let result = resp.data;
    if (result.code == 200) {
      let data = result.data;
      tableData.value = data;
    } else if (result.code === 401) {
      message.error(result.msg);
      logout()
    } else {
      message.error(result.msg);
    }
  })
}
const handleEdit = (item) => {
  editChild.value.open = true;
  editChild.value.formData = item == null ? editChild.value.initFormData : JSON.parse(JSON.stringify(item));
  editChild.value.isSave = item == null;
}
const handleDel = (rows) => {
  Modal.confirm({
    title: formatMessage('page.delete', '删除'),
    content: formatMessage('page.delete.confirm', '确定删除该项吗?'),
    maskClosable: true,
    onOk: async () => {
      const hide = message.loading(formatMessage('common.loading', '请求中'));
      try {
        post('/api/matFieldValue/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
          let result = resp.data;
          if (result.code === 200) {
            message.success(result.msg);
          } else {
            message.error(result.msg);
          }
          getPage()
          hide()
        })
      } catch (error) {
        message.error(formatMessage('common.fail', '请求失败'));
      }
    },
  });
}
const handleExport = async (intl) => {
  postBlob('/api/matFieldValue/export', {}).then(result => {
    const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
    window.location.href = window.URL.createObjectURL(blob);
    return true;
  })
};
const onSearch = () => {
  // console.log('search');
  getPage()
}
const onPageChange = (page, size) => {
  currentPage = page;
  pageSize = size;
  getPage();
}
function handleTableReload(value) {
  getPage()
}
</script>
<script>
export default {
  name: '商品属性扩展值'
}
</script>
<template>
  <div>
    <EditView ref="editChild" @tableReload="handleTableReload" />
    <div class="table-header">
      <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '请输入')"
        style="width: 200px;" @search="onSearch" />
      <div class="table-header-right">
        <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '添加') }}</a-button>
        <a-button @click="handleExport">{{ formatMessage('page.export', '导出') }}</a-button>
      </div>
    </div>
    <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
      :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
      :pagination="{ total: tableData.total, onChange: onPageChange }"
      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns">
      <template #bodyCell="{ column, text, record }">
        <template v-if="column.dataIndex === 'oper'">
          <div style="display: flex;justify-content: space-evenly;">
            <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '编辑') }}</a-button>
            <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '删除')
              }}</a-button>
          </div>
        </template>
      </template>
    </a-table>
  </div>
</template>
<style></style>
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
@@ -9,7 +9,9 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.asrs.entity.MatField;
import com.zy.asrs.wms.asrs.entity.MatFieldValue;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.MatFieldValueService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -33,6 +35,8 @@
    private MatService matService;
    @Autowired
    private MatFieldService matFieldService;
    @Autowired
    private MatFieldValueService matFieldValueService;
    @PreAuthorize("hasAuthority('asrs:mat:list')")
    @PostMapping("/mat/page")
@@ -43,25 +47,12 @@
        JSONObject data = JSON.parseObject(JSON.toJSONString(page));
        ArrayList<JSONObject> list = new ArrayList<>();
        data.put("records", list);
        List<Mat> records = page.getRecords();
        for (Mat record : records) {
            JSONObject tmp = JSON.parseObject(JSON.toJSONString(record));
            String extend = record.getExtend();
            if (!Cools.isEmpty(extend)) {
                List<JSONObject> matFields = JSON.parseArray(extend, JSONObject.class);
                for (JSONObject matField : matFields) {
                    if (matField.getString("type").equals("num")) {
                        tmp.put(matField.getString("name"), matField.getDouble("value"));
                    } else if (matField.getString("type").equals("bool")) {
                        tmp.put(matField.getString("name"), matField.getBoolean("value"));
                    }else {
                        tmp.put(matField.getString("name"), matField.getString("value"));
                    }
                }
            }
            list.add(tmp);
        data.put("records", records);
        for (Mat mat : records) {
            List<MatFieldValue> list = matFieldValueService.list(new LambdaQueryWrapper<MatFieldValue>()
                    .eq(MatFieldValue::getMatId, mat.getId()));
            mat.syncField(list);
        }
        return R.ok().add(data);
@@ -84,13 +75,11 @@
    @PostMapping("/mat/save")
    public R save(@RequestBody HashMap<String,Object> param) {
        Mat mat = JSON.parseObject(JSON.toJSONString(param), Mat.class, Feature.DisableCircularReferenceDetect);
        //获取扩展字段
        List<JSONObject> fields = getMatFieldList(param);
        mat.setExtend(JSON.toJSONString(fields, SerializerFeature.DisableCircularReferenceDetect));
        if (!matService.save(mat)) {
            return R.error("添加失败");
        }
        //设置扩展字段
        setMatField(param, mat);
        return R.ok("添加成功");
    }
@@ -99,9 +88,8 @@
    @PostMapping("/mat/update")
    public R update(@RequestBody HashMap<String,Object> param) {
        Mat mat = JSON.parseObject(JSON.toJSONString(param), Mat.class, Feature.DisableCircularReferenceDetect);
        //获取扩展字段
        List<JSONObject> fields = getMatFieldList(param);
        mat.setExtend(JSON.toJSONString(fields, SerializerFeature.DisableCircularReferenceDetect));
        //设置扩展字段
        setMatField(param, mat);
        if (!matService.updateById(mat)) {
            return R.error("修改失败");
@@ -139,18 +127,27 @@
        ExcelUtil.build(ExcelUtil.create(matService.list(), Mat.class), response);
    }
    private List<JSONObject> getMatFieldList(HashMap<String, Object> param) {
    private void setMatField(HashMap<String, Object> param, Mat mat) {
        //获取扩展字段
        List<MatField> matFields = matFieldService.list();
        ArrayList<JSONObject> fields = new ArrayList<>();
        for (MatField matField : matFields) {
            if(param.containsKey(matField.getName())){
                JSONObject parsed = JSON.parseObject(JSON.toJSONString(matField), Feature.DisableCircularReferenceDetect);
                parsed.put("value", param.get(matField.getName()));
                fields.add(parsed);
            if (param.containsKey(matField.getName())) {
                MatFieldValue fieldValue = matFieldValueService.getOne(new LambdaQueryWrapper<MatFieldValue>()
                        .eq(MatFieldValue::getMatId, mat.getId())
                        .eq(MatFieldValue::getFieldId, matField.getId()));
                if (fieldValue == null) {
                    fieldValue = new MatFieldValue();
                    fieldValue.setMatId(mat.getId());
                    fieldValue.setFieldId(matField.getId());
                    fieldValue.setName(matField.getName());
                    fieldValue.setValue(param.get(matField.getName()).toString());
                    matFieldValueService.save(fieldValue);
                }else {
                    fieldValue.setValue(param.get(matField.getName()).toString());
                    matFieldValueService.updateById(fieldValue);
                }
            }
        }
        return fields;
    }
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatFieldValueController.java
New file
@@ -0,0 +1,102 @@
package com.zy.asrs.wms.asrs.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
import com.zy.asrs.wms.common.domain.PageParam;
import com.zy.asrs.wms.asrs.entity.MatFieldValue;
import com.zy.asrs.wms.asrs.service.MatFieldValueService;
import com.zy.asrs.wms.system.controller.BaseController;
import com.zy.asrs.wms.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/api")
public class MatFieldValueController extends BaseController {
    @Autowired
    private MatFieldValueService matFieldValueService;
    @PreAuthorize("hasAuthority('asrs:matFieldValue:list')")
    @PostMapping("/matFieldValue/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<MatFieldValue, BaseParam> pageParam = new PageParam<>(baseParam, MatFieldValue.class);
        return R.ok().add(matFieldValueService.page(pageParam, pageParam.buildWrapper(true)));
    }
    @PreAuthorize("hasAuthority('asrs:matFieldValue:list')")
    @PostMapping("/matFieldValue/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(matFieldValueService.list());
    }
    @PreAuthorize("hasAuthority('asrs:matFieldValue:list')")
    @GetMapping("/matFieldValue/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(matFieldValueService.getById(id));
    }
    @PreAuthorize("hasAuthority('asrs:matFieldValue:save')")
    @OperationLog("添加商品属性扩展值")
    @PostMapping("/matFieldValue/save")
    public R save(@RequestBody MatFieldValue matFieldValue) {
        if (!matFieldValueService.save(matFieldValue)) {
            return R.error("添加失败");
        }
        return R.ok("添加成功");
    }
    @PreAuthorize("hasAuthority('asrs:matFieldValue:update')")
    @OperationLog("修改商品属性扩展值")
    @PostMapping("/matFieldValue/update")
    public R update(@RequestBody MatFieldValue matFieldValue) {
        if (!matFieldValueService.updateById(matFieldValue)) {
            return R.error("修改失败");
        }
        return R.ok("修改成功");
    }
    @PreAuthorize("hasAuthority('asrs:matFieldValue:remove')")
    @OperationLog("删除商品属性扩展值")
    @PostMapping("/matFieldValue/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!matFieldValueService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        }
        return R.ok("删除成功");
    }
    @PreAuthorize("hasAuthority('asrs:matFieldValue:list')")
    @PostMapping("/matFieldValue/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<MatFieldValue> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(MatFieldValue::getId, condition);
        }
        matFieldValueService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getId()))
        );
        return R.ok().add(vos);
    }
    @PreAuthorize("hasAuthority('asrs:matFieldValue:list')")
    @PostMapping("/matFieldValue/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(matFieldValueService.list(), MatFieldValue.class), response);
    }
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
@@ -2,20 +2,18 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.*;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.zy.asrs.wms.asrs.service.TagService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
@@ -24,7 +22,6 @@
import com.zy.asrs.wms.system.service.HostService;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName("man_mat")
@@ -411,4 +408,24 @@
    }
    //动态扩展字段
    public transient Map<String, Object> dynamicFields;
    @JsonAnyGetter
    public Map<String,Object> getDynamicFields() {
        return dynamicFields;
    }
    public void syncField(List<MatFieldValue> list) {
        Map<String, Object> dynamicFields = new HashMap<>();
        for (MatFieldValue fieldValue : list) {
            dynamicFields.put(fieldValue.getName(), fieldValue.getValue());
        }
        this.dynamicFields = dynamicFields;
    }
    public String getFieldString(String key) {
        return dynamicFields.get(key).toString();
    }
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/MatFieldValue.java
New file
@@ -0,0 +1,234 @@
package com.zy.asrs.wms.asrs.entity;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.MatService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wms.system.service.UserService;
import com.zy.asrs.wms.system.service.HostService;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName("man_mat_field_value")
public class MatFieldValue implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    /**
     * 字段名
     */
    @ApiModelProperty(value= "字段名")
    private String name;
    /**
     * 字段
     */
    @ApiModelProperty(value= "字段")
    private Long fieldId;
    /**
     * 物料
     */
    @ApiModelProperty(value= "物料")
    private Long matId;
    /**
     * 参数值
     */
    @ApiModelProperty(value= "参数值")
    private String value;
    /**
     * 所属机构
     */
    @ApiModelProperty(value= "所属机构")
    private Long hostId;
    /**
     * 状态 1: 正常  0: 禁用
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    private Integer status;
    /**
     * 是否删除 1: 是  0: 否
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;
    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;
    /**
     * 添加人员
     */
    @ApiModelProperty(value= "添加人员")
    private Long createBy;
    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;
    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    private Long updateBy;
    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;
    public MatFieldValue() {}
    public MatFieldValue(String name,Long fieldId,Long matId,String value,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
        this.name = name;
        this.fieldId = fieldId;
        this.matId = matId;
        this.value = value;
        this.hostId = hostId;
        this.status = status;
        this.deleted = deleted;
        this.createTime = createTime;
        this.createBy = createBy;
        this.updateTime = updateTime;
        this.updateBy = updateBy;
        this.memo = memo;
    }
//    MatFieldValue matFieldValue = new MatFieldValue(
//            null,    // 字段名
//            null,    // 字段
//            null,    // 物料
//            null,    // 参数值
//            null,    // 所属机构
//            null,    // 状态
//            null,    // 是否删除
//            null,    // 添加时间
//            null,    // 添加人员
//            null,    // 修改时间
//            null,    // 修改人员
//            null    // 备注
//    );
    public String getFieldId$(){
        MatFieldService service = SpringUtils.getBean(MatFieldService.class);
        MatField matField = service.getById(this.fieldId);
        if (!Cools.isEmpty(matField)){
            return String.valueOf(matField.getId());
        }
        return null;
    }
    public String getMatId$(){
        MatService service = SpringUtils.getBean(MatService.class);
        Mat mat = service.getById(this.matId);
        if (!Cools.isEmpty(mat)){
            return String.valueOf(mat.getId());
        }
        return null;
    }
    public String getHostId$(){
        HostService service = SpringUtils.getBean(HostService.class);
        Host host = service.getById(this.hostId);
        if (!Cools.isEmpty(host)){
            return String.valueOf(host.getName());
        }
        return null;
    }
    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "正常";
            case 0:
                return "禁用";
            default:
                return String.valueOf(this.status);
        }
    }
    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.deleted);
        }
    }
    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }
    public String getCreateBy$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.createBy);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }
    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }
    public String getUpdateBy$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.updateBy);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/MatFieldValueMapper.java
New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.mapper;
import com.zy.asrs.wms.asrs.entity.MatFieldValue;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface MatFieldValueMapper extends BaseMapper<MatFieldValue> {
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/MatFieldValueService.java
New file
@@ -0,0 +1,8 @@
package com.zy.asrs.wms.asrs.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wms.asrs.entity.MatFieldValue;
public interface MatFieldValueService extends IService<MatFieldValue> {
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MatFieldValueServiceImpl.java
New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.service.impl;
import com.zy.asrs.wms.asrs.mapper.MatFieldValueMapper;
import com.zy.asrs.wms.asrs.entity.MatFieldValue;
import com.zy.asrs.wms.asrs.service.MatFieldValueService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("matFieldValueService")
public class MatFieldValueServiceImpl extends ServiceImpl<MatFieldValueMapper, MatFieldValue> implements MatFieldValueService {
}
zy-asrs-wms/src/main/java/matFieldValue.sql
New file
@@ -0,0 +1,9 @@
-- save matFieldValue record
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '商品属性扩展值管理', '0', '/asrs/matFieldValue', '/asrs/matFieldValue', '0' , '0', '1' , '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '查询商品属性扩展值', '', '1', 'asrs:matFieldValue:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '添加商品属性扩展值', '', '1', 'asrs:matFieldValue:save', '1', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '修改商品属性扩展值', '', '1', 'asrs:matFieldValue:update', '2', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '删除商品属性扩展值', '', '1', 'asrs:matFieldValue:remove', '3', '1', '1');
zy-asrs-wms/src/main/resources/mapper/asrs/MatFieldValueMapper.xml
New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.wms.asrs.mapper.MatFieldValueMapper">
</mapper>