add:单位

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/controller/BmMeasureunitController.java

@@ -0,0 +1,76 @@
+
+package org.nl.wms.base_manage.measure.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.entity.PageQuery;
+import org.nl.common.utils.MapOf;
+import org.nl.wms.base_manage.measure.service.IBmMeasureUnitService;
+import org.nl.wms.base_manage.measure.service.dao.BmMeasureUnit;
+import org.nl.wms.base_manage.measure.service.dto.UnitQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author loujf
+ * @date 2021-12-07
+ **/
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/bmMeasureUnit")
+@Slf4j
+public class BmMeasureunitController {
+
+    @Autowired
+    private IBmMeasureUnitService measureUnitService;
+
+    @GetMapping
+    @Log("查询单位")
+    public ResponseEntity<Object> query(UnitQuery query, PageQuery page) {
+        return new ResponseEntity<>(measureUnitService.pageQuery(query, page), HttpStatus.OK);
+    }
+
+    @GetMapping("/select")
+    @Log("查询单位下拉列表设备")
+    public ResponseEntity<Object> selectAll() {
+        List<BmMeasureUnit> list = measureUnitService.list();
+        List<Map> result = new ArrayList<>();
+        for (BmMeasureUnit item : list) {
+            result.add(MapOf.of("label", item.getUnit_name(), "value", item.getMeasure_unit_id()));
+        }
+        return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK);
+    }
+
+    @PostMapping("/add")
+    @Log("新增计量单位")
+    public ResponseEntity<Object> create(@RequestBody JSONObject whereJson) {
+        measureUnitService.create(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/update")
+    @Log("修改计量单位")
+    public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
+        measureUnitService.update(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/delete")
+    @Log("删除计量单位")
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
+        for (Long id : ids) {
+            measureUnitService.removeById(id);
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/IBmMeasureUnitService.java

@@ -0,0 +1,31 @@
+package org.nl.wms.base_manage.measure.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.common.domain.entity.PageQuery;
+import org.nl.wms.base_manage.measure.service.dao.BmMeasureUnit;
+import org.nl.wms.base_manage.measure.service.dto.UnitQuery;
+
+/**
+ * <p>
+ * 计量单位表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+public interface IBmMeasureUnitService extends IService<BmMeasureUnit> {
+
+    /**
+     * 分页查询
+     * @param query,page /
+     * @return JSONObject
+     */
+    Object pageQuery(UnitQuery query, PageQuery page);
+
+    void create(JSONObject jo);
+
+    void update(JSONObject jo);
+
+
+}

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/dao/BmMeasureUnit.java

@@ -0,0 +1,88 @@
+package org.nl.wms.base_manage.measure.service.dao;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 计量单位表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("bm_measure_unit")
+public class BmMeasureUnit implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 计量单位标识
+     */
+    @TableId
+    private String measure_unit_id;
+
+    /**
+     * 编码
+     */
+    private String unit_code;
+
+    /**
+     * 名称
+     */
+    private String unit_name;
+
+    /**
+     * 数据精度
+     */
+    private BigDecimal qty_precision;
+
+    /**
+     * 是否启用
+     */
+    private Boolean is_used;
+
+    /**
+     * 创建人
+     */
+    private String create_id;
+
+    /**
+     * 创建人姓名
+     */
+    private String create_name;
+
+    /**
+     * 创建时间
+     */
+    private String create_time;
+
+    /**
+     * 修改人
+     */
+    private String update_id;
+
+    /**
+     * 修改人姓名
+     */
+    private String update_name;
+
+    /**
+     * 修改时间
+     */
+    private String update_time;
+
+    /**
+     * 外部标识
+     */
+    private String ext_id;
+
+
+}

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/dao/mapper/BmMeasureUnitMapper.java

@@ -0,0 +1,16 @@
+package org.nl.wms.base_manage.measure.service.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.base_manage.measure.service.dao.BmMeasureUnit;
+
+/**
+ * <p>
+ * 计量单位表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+public interface BmMeasureUnitMapper extends BaseMapper<BmMeasureUnit> {
+
+}

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/dao/mapper/xml/BmMeasureUnitMapper.xml

@@ -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="org.nl.wms.base_manage.measure.service.dao.mapper.BmMeasureUnitMapper">
+
+</mapper>

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/dto/UnitQuery.java

@@ -0,0 +1,23 @@
+package org.nl.wms.base_manage.measure.service.dto;
+
+import lombok.Data;
+import org.nl.common.domain.entity.BaseQuery;
+import org.nl.common.domain.entity.QParam;
+import org.nl.common.enums.QueryTEnum;
+import org.nl.wms.base_manage.measure.service.dao.BmMeasureUnit;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/4 19:49
+ */
+@Data
+public class UnitQuery extends BaseQuery<BmMeasureUnit> {
+
+    private String search;
+    @Override
+    public void paramMapping() {
+        super.doP.put("search", QParam.builder().k(new String[]{"unit_name"}).type(QueryTEnum.LK).build());
+    }
+
+
+}

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/impl/BmMeasureUnitServiceImpl.java

@@ -0,0 +1,66 @@
+package org.nl.wms.base_manage.measure.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.jsonwebtoken.lang.Assert;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.entity.PageQuery;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.base_manage.measure.service.IBmMeasureUnitService;
+import org.nl.wms.base_manage.measure.service.dao.BmMeasureUnit;
+import org.nl.wms.base_manage.measure.service.dao.mapper.BmMeasureUnitMapper;
+import org.nl.wms.base_manage.measure.service.dto.UnitQuery;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 计量单位表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+@Service
+public class BmMeasureUnitServiceImpl extends ServiceImpl<BmMeasureUnitMapper, BmMeasureUnit> implements IBmMeasureUnitService {
+
+    @Override
+    public Object pageQuery(UnitQuery query, PageQuery page) {
+        Page<BmMeasureUnit> pageQuery = this.page(page.build(), query.build());
+        return TableDataInfo.build(pageQuery);
+    }
+
+    @Override
+    public void create(JSONObject jo) {
+        String unit_code = jo.getString("unit_code");
+        String unit_name = jo.getString("unit_name");
+        String ext_id = jo.getString("ext_id");
+        BigDecimal qty_precision = jo.getBigDecimal("qty_precision");
+        boolean is_used = jo.getBoolean("is_used");
+        BmMeasureUnit unit = new BmMeasureUnit();
+        unit.setMeasure_unit_id(IdUtil.getStringId());
+        unit.setUnit_code(unit_code);
+        unit.setUnit_name(unit_name);
+        unit.setQty_precision(qty_precision);
+        unit.setExt_id(ext_id);
+        unit.setIs_used(is_used);
+        unit.setCreate_id(SecurityUtils.getCurrentUserId());
+        unit.setCreate_name(SecurityUtils.getCurrentNickName());
+        unit.setCreate_time(DateUtil.now());
+        this.save(unit);
+    }
+
+    @Override
+    public void update(JSONObject jo) {
+        Assert.notNull(new Object[]{jo, jo.get("measure_unit_id")}, "请求参数不能为空");
+        BmMeasureUnit mst = jo.toJavaObject(BmMeasureUnit.class);
+        mst.setUpdate_id(SecurityUtils.getCurrentUserId());
+        mst.setUpdate_name(SecurityUtils.getCurrentNickName());
+        mst.setUpdate_time(DateUtil.now());
+        this.updateById(mst);
+    }
+}

wms_pro/qd/src/api/wms/base_manage/measure/measureunit.js

@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/bmMeasureUnit/add',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/bmMeasureUnit/delete',
+    method: 'post',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/bmMeasureUnit/update',
+    method: 'post',
+    data
+  })
+}
+
+export function getUnit(params) {
+  return request({
+    url: 'api/bmMeasureUnit',
+    method: 'get',
+    params
+  })
+}
+export function getSelect() {
+  return request({
+    url: 'api/bmMeasureUnit/select',
+    method: 'get'
+  })
+}
+
+export default { add, edit, del, getUnit, getSelect }

wms_pro/qd/src/views/wms/base_manage/measure/index.vue

@@ -0,0 +1,222 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <el-input
+        v-model="query.search"
+        clearable
+        style="width: 300px"
+        size="mini"
+        placeholder="输入单位编码或单位名称"
+        prefix-icon="el-icon-search"
+        class="filter-item"
+      />
+      <rrOperation />
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="500px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+          <el-form-item label="编码" prop="unit_code">
+            <el-input v-model="form.unit_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="名称" prop="unit_name">
+            <el-input v-model="form.unit_name" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="外部标识" prop="ext_id">
+            <el-input v-model="form.ext_id" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="数据精度" prop="qty_precision">
+            <!--            <el-input v-model="form.qty_precision" style="width: 370px;" />-->
+            <el-input-number
+              v-model="form.qty_precision"
+              :min="1"
+              :max="6"
+              label="描述文字"
+              style="width: 150px;"
+              @change="handleChange"
+            />
+          </el-form-item>
+          <el-form-item label="是否启用" prop="is_used">
+            <el-switch
+              v-model="form.is_used"
+              active-color="#409EFF"
+              inactive-color="#F56C6C"
+            />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column prop="unit_code" label="编码" />
+        <el-table-column prop="unit_name" label="名称" />
+        <el-table-column prop="qty_precision" label="数据精度" />
+        <el-table-column prop="update_name" label="修改者" />
+        <el-table-column prop="update_time" label="修改时间" width="135" />
+        <el-table-column prop="is_used" label="启用 ">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.is_used"
+              active-color="#409EFF"
+              inactive-color="#F56C6C"
+              @change="changeEnabled(scope.row, scope.row.is_used)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-permission="['admin','mdPbMeasureunit:edit','mdPbMeasureunit:del']"
+          fixed="right"
+          label="操作"
+          width="150px"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudMdPbMeasureunit from '@/api/wms/base_manage/measure/measureunit'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+
+const defaultForm = {
+  measure_unit_id: null,
+  unit_code: null,
+  unit_name: null,
+  qty_precision: null,
+  is_used: true,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null,
+  is_delete: null,
+  ext_id: null
+}
+export default {
+  dicts: ['is_used'],
+  name: 'MeasureUnit',
+  // eslint-disable-next-line vue/no-unused-components
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '计量单位',
+      url: 'api/bmMeasureUnit',
+      optShow: {
+        add: true,
+        reset: true
+      },
+      idField: 'measure_unit_id',
+      sort: 'measure_unit_id,desc',
+      crudMethod: { ...crudMdPbMeasureunit }
+    })
+  },
+  data() {
+    return {
+      permission: {},
+      rules: {
+        measure_unit_id: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        unit_code: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        unit_name: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        qty_precision: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        is_used: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        create_id: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        create_name: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        create_time: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        is_delete: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    // 改变状态
+    changeEnabled(data, val) {
+      this.$confirm('此操作将改变' + data.unit_name + '状态, 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        crudMdPbMeasureunit.edit(data).then(res => {
+          this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {
+          if (data.is_used === false) {
+            data.is_used = true
+            return
+          }
+          if (data.is_used === true) {
+            data.is_used = false
+          }
+        })
+      }).catch(() => {
+        if (data.is_used === false) {
+          data.is_used = true
+          return
+        }
+        if (data.is_used === true) {
+          data.is_used = false
+        }
+      })
+    },
+    handleChange(value) {
+      console.log(value)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>