-- 条码扫描记录表添加,界面添加

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/erp/ErpBarcodesController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.warewms.wms.erp;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.ams.erp.domain.ErpBarcodes;
+import com.ruoyi.ams.erp.service.IErpBarcodesService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 条码扫描记录表Controller
+ * 
+ * @author ruoyi
+ * @date 2023-03-10
+ */
+@RestController
+@RequestMapping("/erp/barcodes")
+public class ErpBarcodesController extends BaseController
+{
+    @Autowired
+    private IErpBarcodesService erpBarcodesService;
+
+    /**
+     * 查询条码扫描记录表列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:barcodes:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ErpBarcodes erpBarcodes)
+    {
+        startPage();
+        List<ErpBarcodes> list = erpBarcodesService.selectErpBarcodesList(erpBarcodes);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出条码扫描记录表列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:barcodes:export')")
+    @Log(title = "条码扫描记录表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ErpBarcodes erpBarcodes)
+    {
+        List<ErpBarcodes> list = erpBarcodesService.selectErpBarcodesList(erpBarcodes);
+        ExcelUtil<ErpBarcodes> util = new ExcelUtil<ErpBarcodes>(ErpBarcodes.class);
+        util.exportExcel(response, list, "条码扫描记录表数据");
+    }
+
+    /**
+     * 获取条码扫描记录表详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:barcodes:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(erpBarcodesService.selectErpBarcodesById(id));
+    }
+
+    /**
+     * 新增条码扫描记录表
+     */
+    @PreAuthorize("@ss.hasPermi('system:barcodes:add')")
+    @Log(title = "条码扫描记录表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ErpBarcodes erpBarcodes)
+    {
+        return toAjax(erpBarcodesService.insertErpBarcodes(erpBarcodes));
+    }
+
+    /**
+     * 修改条码扫描记录表
+     */
+    @PreAuthorize("@ss.hasPermi('system:barcodes:edit')")
+    @Log(title = "条码扫描记录表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ErpBarcodes erpBarcodes)
+    {
+        return toAjax(erpBarcodesService.updateErpBarcodes(erpBarcodes));
+    }
+
+    /**
+     * 删除条码扫描记录表
+     */
+    @PreAuthorize("@ss.hasPermi('system:barcodes:remove')")
+    @Log(title = "条码扫描记录表", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(erpBarcodesService.deleteErpBarcodesByIds(ids));
+    }
+}

ruoyi-ui/src/api/erp/barcodes.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询条码扫描记录表列表
+export function listBarcodes(query) {
+  return request({
+    url: '/erp/barcodes/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询条码扫描记录表详细
+export function getBarcodes(id) {
+  return request({
+    url: '/erp/barcodes/' + id,
+    method: 'get'
+  })
+}
+
+// 新增条码扫描记录表
+export function addBarcodes(data) {
+  return request({
+    url: '/erp/barcodes',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改条码扫描记录表
+export function updateBarcodes(data) {
+  return request({
+    url: '/erp/barcodes',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除条码扫描记录表
+export function delBarcodes(id) {
+  return request({
+    url: '/erp/barcodes/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/wms/barcodes/index.vue

@@ -0,0 +1,484 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="条码号" prop="barcode">
+        <el-input
+          v-model="queryParams.barcode"
+          placeholder="请输入条码号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库id" prop="stockId">
+        <el-input
+          v-model="queryParams.stockId"
+          placeholder="请输入仓库id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货架编号" prop="locationNo">
+        <el-input
+          v-model="queryParams.locationNo"
+          placeholder="请输入货架编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="栈板号" prop="boxNo">
+        <el-input
+          v-model="queryParams.boxNo"
+          placeholder="请输入栈板号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="批次" prop="lotnum">
+        <el-input
+          v-model="queryParams.lotnum"
+          placeholder="请输入批次"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="数量" prop="qty">
+        <el-input
+          v-model="queryParams.qty"
+          placeholder="请输入数量"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="erp单号" prop="erpNo">
+        <el-input
+          v-model="queryParams.erpNo"
+          placeholder="请输入erp单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项次" prop="erpName">
+        <el-input
+          v-model="queryParams.erpName"
+          placeholder="请输入项次"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预留字段1" prop="userdefine1">
+        <el-input
+          v-model="queryParams.userdefine1"
+          placeholder="请输入预留字段1"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预留字段2" prop="userdefine2">
+        <el-input
+          v-model="queryParams.userdefine2"
+          placeholder="请输入预留字段2"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预留字段3" prop="userdefine3">
+        <el-input
+          v-model="queryParams.userdefine3"
+          placeholder="请输入预留字段3"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预留字段4" prop="userdefine4">
+        <el-input
+          v-model="queryParams.userdefine4"
+          placeholder="请输入预留字段4"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预留字段5" prop="userdefine5">
+        <el-input
+          v-model="queryParams.userdefine5"
+          placeholder="请输入预留字段5"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预留字段3" prop="userdefine6">
+        <el-input
+          v-model="queryParams.userdefine6"
+          placeholder="请输入预留字段3"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预留字段4" prop="userdefine7">
+        <el-input
+          v-model="queryParams.userdefine7"
+          placeholder="请输入预留字段4"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预留字段5" prop="userdefine8">
+        <el-input
+          v-model="queryParams.userdefine8"
+          placeholder="请输入预留字段5"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:barcodes:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:barcodes:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:barcodes:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:barcodes:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="barcodesList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="条码号" align="center" prop="barcode" />
+      <el-table-column label="仓库id" align="center" prop="stockId" />
+      <el-table-column label="货架编号" align="center" prop="locationNo" />
+      <el-table-column label="栈板号" align="center" prop="boxNo" />
+      <el-table-column label="批次" align="center" prop="lotnum" />
+      <el-table-column label="数量" align="center" prop="qty" />
+      <el-table-column label="入库/出库" align="center" prop="type" />
+      <el-table-column label="erp单号" align="center" prop="erpNo" />
+      <el-table-column label="项次" align="center" prop="erpName" />
+      <el-table-column label="erp单据类型" align="center" prop="erpType" />
+      <el-table-column label="预留字段1" align="center" prop="userdefine1" />
+      <el-table-column label="预留字段2" align="center" prop="userdefine2" />
+      <el-table-column label="预留字段3" align="center" prop="userdefine3" />
+      <el-table-column label="预留字段4" align="center" prop="userdefine4" />
+      <el-table-column label="预留字段5" align="center" prop="userdefine5" />
+      <el-table-column label="预留字段3" align="center" prop="userdefine6" />
+      <el-table-column label="预留字段4" align="center" prop="userdefine7" />
+      <el-table-column label="预留字段5" align="center" prop="userdefine8" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:barcodes:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:barcodes:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改条码扫描记录表对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="条码号" prop="barcode">
+          <el-input v-model="form.barcode" placeholder="请输入条码号" />
+        </el-form-item>
+        <el-form-item label="仓库id" prop="stockId">
+          <el-input v-model="form.stockId" placeholder="请输入仓库id" />
+        </el-form-item>
+        <el-form-item label="货架编号" prop="locationNo">
+          <el-input v-model="form.locationNo" placeholder="请输入货架编号" />
+        </el-form-item>
+        <el-form-item label="栈板号" prop="boxNo">
+          <el-input v-model="form.boxNo" placeholder="请输入栈板号" />
+        </el-form-item>
+        <el-form-item label="批次" prop="lotnum">
+          <el-input v-model="form.lotnum" placeholder="请输入批次" />
+        </el-form-item>
+        <el-form-item label="数量" prop="qty">
+          <el-input v-model="form.qty" placeholder="请输入数量" />
+        </el-form-item>
+        <el-form-item label="erp单号" prop="erpNo">
+          <el-input v-model="form.erpNo" placeholder="请输入erp单号" />
+        </el-form-item>
+        <el-form-item label="项次" prop="erpName">
+          <el-input v-model="form.erpName" placeholder="请输入项次" />
+        </el-form-item>
+        <el-form-item label="预留字段1" prop="userdefine1">
+          <el-input v-model="form.userdefine1" placeholder="请输入预留字段1" />
+        </el-form-item>
+        <el-form-item label="预留字段2" prop="userdefine2">
+          <el-input v-model="form.userdefine2" placeholder="请输入预留字段2" />
+        </el-form-item>
+        <el-form-item label="预留字段3" prop="userdefine3">
+          <el-input v-model="form.userdefine3" placeholder="请输入预留字段3" />
+        </el-form-item>
+        <el-form-item label="预留字段4" prop="userdefine4">
+          <el-input v-model="form.userdefine4" placeholder="请输入预留字段4" />
+        </el-form-item>
+        <el-form-item label="预留字段5" prop="userdefine5">
+          <el-input v-model="form.userdefine5" placeholder="请输入预留字段5" />
+        </el-form-item>
+        <el-form-item label="预留字段3" prop="userdefine6">
+          <el-input v-model="form.userdefine6" placeholder="请输入预留字段3" />
+        </el-form-item>
+        <el-form-item label="预留字段4" prop="userdefine7">
+          <el-input v-model="form.userdefine7" placeholder="请输入预留字段4" />
+        </el-form-item>
+        <el-form-item label="预留字段5" prop="userdefine8">
+          <el-input v-model="form.userdefine8" placeholder="请输入预留字段5" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listBarcodes, getBarcodes, delBarcodes, addBarcodes, updateBarcodes } from "@/api/erp/barcodes";
+
+export default {
+  name: "Barcodes",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 条码扫描记录表表格数据
+      barcodesList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        barcode: null,
+        stockId: null,
+        locationNo: null,
+        boxNo: null,
+        lotnum: null,
+        qty: null,
+        type: null,
+        erpNo: null,
+        erpName: null,
+        erpType: null,
+        userdefine1: null,
+        userdefine2: null,
+        userdefine3: null,
+        userdefine4: null,
+        userdefine5: null,
+        userdefine6: null,
+        userdefine7: null,
+        userdefine8: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        createTime: [
+          { required: true, message: "$comment不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询条码扫描记录表列表 */
+    getList() {
+      this.loading = true;
+      listBarcodes(this.queryParams).then(response => {
+        this.barcodesList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        barcode: null,
+        stockId: null,
+        locationNo: null,
+        boxNo: null,
+        lotnum: null,
+        qty: null,
+        type: null,
+        erpNo: null,
+        erpName: null,
+        erpType: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        userdefine1: null,
+        userdefine2: null,
+        userdefine3: null,
+        userdefine4: null,
+        userdefine5: null,
+        userdefine6: null,
+        userdefine7: null,
+        userdefine8: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加条码扫描记录表";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getBarcodes(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改条码扫描记录表";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateBarcodes(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBarcodes(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除条码扫描记录表编号为"' + ids + '"的数据项？').then(function() {
+        return delBarcodes(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/barcodes/export', {
+        ...this.queryParams
+      }, `barcodes_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

warewms-ams/src/main/java/com/ruoyi/ams/erp/domain/ErpBarcodes.java

@@ -1,66 +1,294 @@
 package com.ruoyi.ams.erp.domain;
 
 import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 条码扫描记录表 erp_barcodes
+ * 条码扫描记录表对象 erp_barcodes
  * 
  * @author ruoyi
- * @date 2022-11-14
+ * @date 2023-03-10
  */
-public class ErpBarcodes
+public class ErpBarcodes extends BaseEntity
 {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
 
     /** 条码号 */
+    @Excel(name = "条码号")
     private String barcode;
 
     /** 仓库id */
+    @Excel(name = "仓库id")
     private String stockId;
 
     /** 货架编号 */
+    @Excel(name = "货架编号")
     private String locationNo;
 
     /** 栈板号 */
+    @Excel(name = "栈板号")
     private String boxNo;
 
     /** 批次 */
+    @Excel(name = "批次")
     private String lotnum;
 
     /** 数量 */
+    @Excel(name = "数量")
     private BigDecimal qty;
 
     /** 入库/出库 */
+    @Excel(name = "入库/出库")
     private String type;
 
     /** erp单号 */
+    @Excel(name = "erp单号")
     private String erpNo;
+
     /** 项次 */
+    @Excel(name = "项次")
     private String erpName;
+
     /** erp单据类型 */
+    @Excel(name = "erp单据类型")
     private String erpType;
 
-    private String createTime;
-
-    private String createBy;
-
-    private String updateTime;
-
-    private String updateBy;
-
+    /** 预留字段1 */
+    @Excel(name = "预留字段1")
     private String userdefine1;
 
+    /** 预留字段2 */
+    @Excel(name = "预留字段2")
     private String userdefine2;
 
+    /** 预留字段3 */
+    @Excel(name = "预留字段3")
     private String userdefine3;
 
+    /** 预留字段4 */
+    @Excel(name = "预留字段4")
     private String userdefine4;
 
+    /** 预留字段5 */
+    @Excel(name = "预留字段5")
     private String userdefine5;
 
+    /** 预留字段3 */
+    @Excel(name = "预留字段3")
     private String userdefine6;
 
+    /** 预留字段4 */
+    @Excel(name = "预留字段4")
     private String userdefine7;
 
+    /** 预留字段5 */
+    @Excel(name = "预留字段5")
     private String userdefine8;
 
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setBarcode(String barcode) 
+    {
+        this.barcode = barcode;
+    }
+
+    public String getBarcode() 
+    {
+        return barcode;
+    }
+    public void setStockId(String stockId) 
+    {
+        this.stockId = stockId;
+    }
+
+    public String getStockId() 
+    {
+        return stockId;
+    }
+    public void setLocationNo(String locationNo) 
+    {
+        this.locationNo = locationNo;
+    }
+
+    public String getLocationNo() 
+    {
+        return locationNo;
+    }
+    public void setBoxNo(String boxNo) 
+    {
+        this.boxNo = boxNo;
+    }
+
+    public String getBoxNo() 
+    {
+        return boxNo;
+    }
+    public void setLotnum(String lotnum) 
+    {
+        this.lotnum = lotnum;
+    }
+
+    public String getLotnum() 
+    {
+        return lotnum;
+    }
+    public void setQty(BigDecimal qty) 
+    {
+        this.qty = qty;
+    }
+
+    public BigDecimal getQty() 
+    {
+        return qty;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setErpNo(String erpNo) 
+    {
+        this.erpNo = erpNo;
+    }
+
+    public String getErpNo() 
+    {
+        return erpNo;
+    }
+    public void setErpName(String erpName) 
+    {
+        this.erpName = erpName;
+    }
+
+    public String getErpName() 
+    {
+        return erpName;
+    }
+    public void setErpType(String erpType) 
+    {
+        this.erpType = erpType;
+    }
+
+    public String getErpType() 
+    {
+        return erpType;
+    }
+    public void setUserdefine1(String userdefine1) 
+    {
+        this.userdefine1 = userdefine1;
+    }
+
+    public String getUserdefine1() 
+    {
+        return userdefine1;
+    }
+    public void setUserdefine2(String userdefine2) 
+    {
+        this.userdefine2 = userdefine2;
+    }
+
+    public String getUserdefine2() 
+    {
+        return userdefine2;
+    }
+    public void setUserdefine3(String userdefine3) 
+    {
+        this.userdefine3 = userdefine3;
+    }
+
+    public String getUserdefine3() 
+    {
+        return userdefine3;
+    }
+    public void setUserdefine4(String userdefine4) 
+    {
+        this.userdefine4 = userdefine4;
+    }
+
+    public String getUserdefine4() 
+    {
+        return userdefine4;
+    }
+    public void setUserdefine5(String userdefine5) 
+    {
+        this.userdefine5 = userdefine5;
+    }
+
+    public String getUserdefine5() 
+    {
+        return userdefine5;
+    }
+    public void setUserdefine6(String userdefine6) 
+    {
+        this.userdefine6 = userdefine6;
+    }
+
+    public String getUserdefine6() 
+    {
+        return userdefine6;
+    }
+    public void setUserdefine7(String userdefine7) 
+    {
+        this.userdefine7 = userdefine7;
+    }
+
+    public String getUserdefine7() 
+    {
+        return userdefine7;
+    }
+    public void setUserdefine8(String userdefine8) 
+    {
+        this.userdefine8 = userdefine8;
+    }
+
+    public String getUserdefine8() 
+    {
+        return userdefine8;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("barcode", getBarcode())
+            .append("stockId", getStockId())
+            .append("locationNo", getLocationNo())
+            .append("boxNo", getBoxNo())
+            .append("lotnum", getLotnum())
+            .append("qty", getQty())
+            .append("type", getType())
+            .append("erpNo", getErpNo())
+            .append("erpName", getErpName())
+            .append("erpType", getErpType())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("userdefine1", getUserdefine1())
+            .append("userdefine2", getUserdefine2())
+            .append("userdefine3", getUserdefine3())
+            .append("userdefine4", getUserdefine4())
+            .append("userdefine5", getUserdefine5())
+            .append("userdefine6", getUserdefine6())
+            .append("userdefine7", getUserdefine7())
+            .append("userdefine8", getUserdefine8())
+            .toString();
+    }
 }

warewms-ams/src/main/java/com/ruoyi/ams/erp/mapper/ErpBarcodesMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.ams.erp.mapper;
+
+import com.ruoyi.ams.erp.domain.ErpBarcodes;
+
+import java.util.List;
+
+/**
+ * 条码扫描记录表Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-03-10
+ */
+public interface ErpBarcodesMapper 
+{
+    /**
+     * 查询条码扫描记录表
+     * 
+     * @param id 条码扫描记录表主键
+     * @return 条码扫描记录表
+     */
+     ErpBarcodes selectErpBarcodesById(Long id);
+
+    /**
+     * 查询条码扫描记录表列表
+     * 
+     * @param erpBarcodes 条码扫描记录表
+     * @return 条码扫描记录表集合
+     */
+     List<ErpBarcodes> selectErpBarcodesList(ErpBarcodes erpBarcodes);
+
+    /**
+     * 新增条码扫描记录表
+     * 
+     * @param erpBarcodes 条码扫描记录表
+     * @return 结果
+     */
+     int insertErpBarcodes(ErpBarcodes erpBarcodes);
+
+    /**
+     * 修改条码扫描记录表
+     * 
+     * @param erpBarcodes 条码扫描记录表
+     * @return 结果
+     */
+     int updateErpBarcodes(ErpBarcodes erpBarcodes);
+
+    /**
+     * 删除条码扫描记录表
+     * 
+     * @param id 条码扫描记录表主键
+     * @return 结果
+     */
+     int deleteErpBarcodesById(Long id);
+
+    /**
+     * 批量删除条码扫描记录表
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+     int deleteErpBarcodesByIds(Long[] ids);
+}

warewms-ams/src/main/java/com/ruoyi/ams/erp/service/IErpBarcodesService.java

@@ -0,0 +1,70 @@
+package com.ruoyi.ams.erp.service;
+
+import com.ruoyi.ams.erp.domain.ErpBarcodes;
+
+import java.util.List;
+
+/**
+ * 条码扫描记录表Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-03-10
+ */
+public interface IErpBarcodesService 
+{
+    /**
+     * 查询条码扫描记录表
+     * 
+     * @param id 条码扫描记录表主键
+     * @return 条码扫描记录表
+     */
+     ErpBarcodes selectErpBarcodesById(Long id);
+
+    /**
+     * 查询条码扫描记录表列表
+     * 
+     * @param erpBarcodes 条码扫描记录表
+     * @return 条码扫描记录表集合
+     */
+     List<ErpBarcodes> selectErpBarcodesList(ErpBarcodes erpBarcodes);
+
+    /**
+     * 查询条码扫描记录表
+     *
+     * @param erpBarcodes 条码扫描记录表
+     * @return 条码扫描记录表集合
+     */
+    ErpBarcodes selectErpBarcodesByModel(ErpBarcodes erpBarcodes);
+
+    /**
+     * 新增条码扫描记录表
+     * 
+     * @param erpBarcodes 条码扫描记录表
+     * @return 结果
+     */
+     int insertErpBarcodes(ErpBarcodes erpBarcodes);
+
+    /**
+     * 修改条码扫描记录表
+     * 
+     * @param erpBarcodes 条码扫描记录表
+     * @return 结果
+     */
+     int updateErpBarcodes(ErpBarcodes erpBarcodes);
+
+    /**
+     * 批量删除条码扫描记录表
+     * 
+     * @param ids 需要删除的条码扫描记录表主键集合
+     * @return 结果
+     */
+     int deleteErpBarcodesByIds(Long[] ids);
+
+    /**
+     * 删除条码扫描记录表信息
+     * 
+     * @param id 条码扫描记录表主键
+     * @return 结果
+     */
+     int deleteErpBarcodesById(Long id);
+}

warewms-ams/src/main/java/com/ruoyi/ams/erp/service/impl/ErpBarcodesServiceImpl.java

@@ -0,0 +1,114 @@
+package com.ruoyi.ams.erp.service.impl;
+
+import com.ruoyi.ams.erp.domain.ErpBarcodes;
+import com.ruoyi.ams.erp.mapper.ErpBarcodesMapper;
+import com.ruoyi.ams.erp.service.IErpBarcodesService;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 条码扫描记录表Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-03-10
+ */
+@Service
+public class ErpBarcodesServiceImpl implements IErpBarcodesService
+{
+    @Autowired
+    private ErpBarcodesMapper erpBarcodesMapper;
+
+    /**
+     * 查询条码扫描记录表
+     * 
+     * @param id 条码扫描记录表主键
+     * @return 条码扫描记录表
+     */
+    @Override
+    public ErpBarcodes selectErpBarcodesById(Long id)
+    {
+        return erpBarcodesMapper.selectErpBarcodesById(id);
+    }
+
+    /**
+     * 查询条码扫描记录表列表
+     * 
+     * @param erpBarcodes 条码扫描记录表
+     * @return 条码扫描记录表
+     */
+    @Override
+    public List<ErpBarcodes> selectErpBarcodesList(ErpBarcodes erpBarcodes)
+    {
+        return erpBarcodesMapper.selectErpBarcodesList(erpBarcodes);
+    }
+
+    /**
+     * 查询条码扫描记录表
+     *
+     * @param erpBarcodes 条码扫描记录表
+     * @return 条码扫描记录表
+     */
+    @Override
+    public ErpBarcodes selectErpBarcodesByModel(ErpBarcodes erpBarcodes)
+    {
+        List<ErpBarcodes> list = erpBarcodesMapper.selectErpBarcodesList(erpBarcodes);
+        if (list!=null && list.size()>0) {
+            return list.get(0);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * 新增条码扫描记录表
+     * 
+     * @param erpBarcodes 条码扫描记录表
+     * @return 结果
+     */
+    @Override
+    public int insertErpBarcodes(ErpBarcodes erpBarcodes)
+    {
+        erpBarcodes.setCreateTime(DateUtils.getNowDate());
+        return erpBarcodesMapper.insertErpBarcodes(erpBarcodes);
+    }
+
+    /**
+     * 修改条码扫描记录表
+     * 
+     * @param erpBarcodes 条码扫描记录表
+     * @return 结果
+     */
+    @Override
+    public int updateErpBarcodes(ErpBarcodes erpBarcodes)
+    {
+        erpBarcodes.setUpdateTime(DateUtils.getNowDate());
+        return erpBarcodesMapper.updateErpBarcodes(erpBarcodes);
+    }
+
+    /**
+     * 批量删除条码扫描记录表
+     * 
+     * @param ids 需要删除的条码扫描记录表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteErpBarcodesByIds(Long[] ids)
+    {
+        return erpBarcodesMapper.deleteErpBarcodesByIds(ids);
+    }
+
+    /**
+     * 删除条码扫描记录表信息
+     * 
+     * @param id 条码扫描记录表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteErpBarcodesById(Long id)
+    {
+        return erpBarcodesMapper.deleteErpBarcodesById(id);
+    }
+}

warewms-ams/src/main/resources/mapper/erp/ErpBarcodesMapper.xml

@@ -0,0 +1,157 @@
+<?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.ruoyi.ams.erp.mapper.ErpBarcodesMapper">
+    
+    <resultMap type="com.ruoyi.ams.erp.domain.ErpBarcodes" id="ErpBarcodesResult">
+        <result property="id"    column="id"    />
+        <result property="barcode"    column="barcode"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="locationNo"    column="location_no"    />
+        <result property="boxNo"    column="box_no"    />
+        <result property="lotnum"    column="lotnum"    />
+        <result property="qty"    column="qty"    />
+        <result property="type"    column="type"    />
+        <result property="erpNo"    column="erp_no"    />
+        <result property="erpName"    column="erp_name"    />
+        <result property="erpType"    column="erp_type"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="userdefine1"    column="userdefine1"    />
+        <result property="userdefine2"    column="userdefine2"    />
+        <result property="userdefine3"    column="userdefine3"    />
+        <result property="userdefine4"    column="userdefine4"    />
+        <result property="userdefine5"    column="userdefine5"    />
+        <result property="userdefine6"    column="userdefine6"    />
+        <result property="userdefine7"    column="userdefine7"    />
+        <result property="userdefine8"    column="userdefine8"    />
+    </resultMap>
+
+    <sql id="selectErpBarcodesVo">
+        select id, barcode, stock_id, location_no, box_no, lotnum, qty, type, erp_no, erp_name, erp_type, create_time, create_by, update_time, update_by, userdefine1, userdefine2, userdefine3, userdefine4, userdefine5, userdefine6, userdefine7, userdefine8 from erp_barcodes
+    </sql>
+
+    <select id="selectErpBarcodesList" parameterType="ErpBarcodes" resultMap="ErpBarcodesResult">
+        <include refid="selectErpBarcodesVo"/>
+        <where>  
+            <if test="barcode != null  and barcode != ''"> and barcode = #{barcode}</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
+            <if test="locationNo != null  and locationNo != ''"> and location_no = #{locationNo}</if>
+            <if test="boxNo != null  and boxNo != ''"> and box_no = #{boxNo}</if>
+            <if test="lotnum != null  and lotnum != ''"> and lotnum = #{lotnum}</if>
+            <if test="qty != null "> and qty = #{qty}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="erpNo != null  and erpNo != ''"> and erp_no = #{erpNo}</if>
+            <if test="erpName != null  and erpName != ''"> and erp_name like concat('%', #{erpName}, '%')</if>
+            <if test="erpType != null  and erpType != ''"> and erp_type = #{erpType}</if>
+            <if test="userdefine1 != null  and userdefine1 != ''"> and userdefine1 = #{userdefine1}</if>
+            <if test="userdefine2 != null  and userdefine2 != ''"> and userdefine2 = #{userdefine2}</if>
+            <if test="userdefine3 != null  and userdefine3 != ''"> and userdefine3 = #{userdefine3}</if>
+            <if test="userdefine4 != null  and userdefine4 != ''"> and userdefine4 = #{userdefine4}</if>
+            <if test="userdefine5 != null  and userdefine5 != ''"> and userdefine5 = #{userdefine5}</if>
+            <if test="userdefine6 != null  and userdefine6 != ''"> and userdefine6 = #{userdefine6}</if>
+            <if test="userdefine7 != null  and userdefine7 != ''"> and userdefine7 = #{userdefine7}</if>
+            <if test="userdefine8 != null  and userdefine8 != ''"> and userdefine8 = #{userdefine8}</if>
+        </where>
+    </select>
+    
+    <select id="selectErpBarcodesById" parameterType="Long" resultMap="ErpBarcodesResult">
+        <include refid="selectErpBarcodesVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertErpBarcodes" parameterType="ErpBarcodes" useGeneratedKeys="true" keyProperty="id">
+        insert into erp_barcodes
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="barcode != null">barcode,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="locationNo != null">location_no,</if>
+            <if test="boxNo != null">box_no,</if>
+            <if test="lotnum != null">lotnum,</if>
+            <if test="qty != null">qty,</if>
+            <if test="type != null">type,</if>
+            <if test="erpNo != null">erp_no,</if>
+            <if test="erpName != null">erp_name,</if>
+            <if test="erpType != null">erp_type,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="userdefine1 != null">userdefine1,</if>
+            <if test="userdefine2 != null">userdefine2,</if>
+            <if test="userdefine3 != null">userdefine3,</if>
+            <if test="userdefine4 != null">userdefine4,</if>
+            <if test="userdefine5 != null">userdefine5,</if>
+            <if test="userdefine6 != null">userdefine6,</if>
+            <if test="userdefine7 != null">userdefine7,</if>
+            <if test="userdefine8 != null">userdefine8,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="barcode != null">#{barcode},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="locationNo != null">#{locationNo},</if>
+            <if test="boxNo != null">#{boxNo},</if>
+            <if test="lotnum != null">#{lotnum},</if>
+            <if test="qty != null">#{qty},</if>
+            <if test="type != null">#{type},</if>
+            <if test="erpNo != null">#{erpNo},</if>
+            <if test="erpName != null">#{erpName},</if>
+            <if test="erpType != null">#{erpType},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="userdefine1 != null">#{userdefine1},</if>
+            <if test="userdefine2 != null">#{userdefine2},</if>
+            <if test="userdefine3 != null">#{userdefine3},</if>
+            <if test="userdefine4 != null">#{userdefine4},</if>
+            <if test="userdefine5 != null">#{userdefine5},</if>
+            <if test="userdefine6 != null">#{userdefine6},</if>
+            <if test="userdefine7 != null">#{userdefine7},</if>
+            <if test="userdefine8 != null">#{userdefine8},</if>
+         </trim>
+    </insert>
+
+    <update id="updateErpBarcodes" parameterType="ErpBarcodes">
+        update erp_barcodes
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="barcode != null">barcode = #{barcode},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="locationNo != null">location_no = #{locationNo},</if>
+            <if test="boxNo != null">box_no = #{boxNo},</if>
+            <if test="lotnum != null">lotnum = #{lotnum},</if>
+            <if test="qty != null">qty = #{qty},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="erpNo != null">erp_no = #{erpNo},</if>
+            <if test="erpName != null">erp_name = #{erpName},</if>
+            <if test="erpType != null">erp_type = #{erpType},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="userdefine1 != null">userdefine1 = #{userdefine1},</if>
+            <if test="userdefine2 != null">userdefine2 = #{userdefine2},</if>
+            <if test="userdefine3 != null">userdefine3 = #{userdefine3},</if>
+            <if test="userdefine4 != null">userdefine4 = #{userdefine4},</if>
+            <if test="userdefine5 != null">userdefine5 = #{userdefine5},</if>
+            <if test="userdefine6 != null">userdefine6 = #{userdefine6},</if>
+            <if test="userdefine7 != null">userdefine7 = #{userdefine7},</if>
+            <if test="userdefine8 != null">userdefine8 = #{userdefine8},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteErpBarcodesById" parameterType="Long">
+        delete from erp_barcodes where id = #{id}
+    </delete>
+
+    <delete id="deleteErpBarcodesByIds" parameterType="String">
+        delete from erp_barcodes where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>