From 5c4432259a5cebf2cc3887e5da52805a84cb8940 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Tue, 2 Jul 2024 21:36:13 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E4=BA=BA=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E7=94=B5=E8=AF=9D=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/stock/domain/StockInfo.java | 77 ++++++++------- .../service/impl/StockAdjustServiceImpl.java | 2 +- .../impl/WarehousingOutHeadServiceImpl.java | 4 +- .../impl/WarehousingRecordServiceImpl.java | 2 +- .../mapper/stock/StockInfoMapper.xml | 43 ++++---- .../templates/stock/stockInfo/stockInfo.html | 98 +++++++------------ 6 files changed, 106 insertions(+), 120 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/StockInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/StockInfo.java index cc98316d..dfd8ed64 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/StockInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/StockInfo.java @@ -20,11 +20,11 @@ public class StockInfo extends BaseEntity /** 仓库编号 */ @Excel(name = "仓库编号") - private String StockNO; + private String stockNO; /** 仓库名 */ @Excel(name = "仓库名") - private String Stockname; + private String stockName; /** 仓库地址 */ @Excel(name = "仓库地址") @@ -32,11 +32,14 @@ public class StockInfo extends BaseEntity /** 仓库管理人 */ @Excel(name = "仓库管理人") - private String stockmanager; + private String stockManager; + + @Excel(name = "仓库管理人电话") + private String stockManagerPhone; /** 仓库备注 */ @Excel(name = "仓库备注") - private String stockmemo; + private String stockMemo; /** */ private String defaltItemclass; @@ -58,49 +61,46 @@ public class StockInfo extends BaseEntity } public String getStockNO() { - return StockNO; + return stockNO; } - public void setStockNO(String StockNO) { - this.StockNO = StockNO; + public void setStockNO(String stockNO) { + this.stockNO = stockNO; } - public String getStockname() { - return Stockname; + public String getStockName() { + return stockName; } - public void setStockname(String Stockname) { - this.Stockname = Stockname; + public void setStockName(String stockName) { + this.stockName = stockName; } - public void setStockAddr(String stockAddr) - { - this.stockAddr = stockAddr; + public String getStockAddr() { + return stockAddr; } - public String getStockAddr() - { - return stockAddr; + public void setStockAddr(String stockAddr) { + this.stockAddr = stockAddr; } - public void setStockmanager(String stockmanager) - { - this.stockmanager = stockmanager; + + public String getStockManager() { + return stockManager; } - public String getStockmanager() - { - return stockmanager; + public void setStockManager(String stockManager) { + this.stockManager = stockManager; } - public void setStockmemo(String stockmemo) - { - this.stockmemo = stockmemo; + + public String getStockMemo() { + return stockMemo; } - public String getStockmemo() - { - return stockmemo; + public void setStockMemo(String stockMemo) { + this.stockMemo = stockMemo; } - public void setDefaltItemclass(String defaltItemclass) + + public void setDefaltItemclass(String defaltItemclass) { this.defaltItemclass = defaltItemclass; } @@ -126,15 +126,24 @@ public class StockInfo extends BaseEntity this.updateInfoTime = updateInfoTime; } + public String getStockManagerPhone() { + return stockManagerPhone; + } + + public void setStockManagerPhone(String stockManagerPhone) { + this.stockManagerPhone = stockManagerPhone; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("stockId", getStockId()) - .append("StockNO", getStockNO()) - .append("Stockname", getStockname()) + .append("stockNO", getStockNO()) + .append("stockName", getStockName()) .append("stockAddr", getStockAddr()) - .append("stockmanager", getStockmanager()) - .append("stockmemo", getStockmemo()) + .append("stockmanager", getStockManager()) + .append("stockManagerPhone", getStockManagerPhone()) + .append("stockmemo", getStockMemo()) .append("defaltItemclass", getDefaltItemclass()) .append("firstAddTime", getFirstAddTime()) .append("updateInfoTime", getUpdateInfoTime()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/StockAdjustServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/StockAdjustServiceImpl.java index 6b7ff25d..7cef0532 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/StockAdjustServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/StockAdjustServiceImpl.java @@ -68,7 +68,7 @@ public class StockAdjustServiceImpl implements IStockAdjustService { public int insertStockAdjust(StockAdjust stockAdjust) { //获取仓库号 StockInfo stockInfo = new StockInfo(); - stockInfo.setStockname(stockAdjust.getStockName()); + stockInfo.setStockName(stockAdjust.getStockName()); stockInfo = stockInfoMapper.selectStockInfoList(stockInfo).get(0); stockAdjust.setStockNo(stockInfo.getStockNO()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehousingOutHeadServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehousingOutHeadServiceImpl.java index fbeac710..bdbdc711 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehousingOutHeadServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehousingOutHeadServiceImpl.java @@ -167,7 +167,7 @@ public class WarehousingOutHeadServiceImpl implements IWarehousingOutHeadService } } StockInfo stockInfo = new StockInfo(); - stockInfo.setStockname(warehousingOutHead.getStockName()); + stockInfo.setStockName(warehousingOutHead.getStockName()); List getStock = stockInfoMapper.selectStockInfoList(stockInfo); warehousingOutHead.setStockNo(getStock.get(0).getStockNO()); return warehousingOutHeadMapper.insertWarehousingOutHead(warehousingOutHead); @@ -198,7 +198,7 @@ public class WarehousingOutHeadServiceImpl implements IWarehousingOutHeadService warehousingRecordMapper.updateSurplusQty(warehousingRecord); } StockInfo stockInfo = new StockInfo(); - stockInfo.setStockname(warehousingOutHead.getStockName()); + stockInfo.setStockName(warehousingOutHead.getStockName()); List getStock = stockInfoMapper.selectStockInfoList(stockInfo); warehousingOutHead.setStockNo(getStock.get(0).getStockNO()); return warehousingOutHeadMapper.insertWarehousingOutHead(warehousingOutHead); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehousingRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehousingRecordServiceImpl.java index 91f83c34..9ec882e5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehousingRecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehousingRecordServiceImpl.java @@ -66,7 +66,7 @@ public class WarehousingRecordServiceImpl implements IWarehousingRecordService { @Override public int insertWarehousingRecord(WarehousingRecord warehousingRecord) { StockInfo stockInfo = new StockInfo(); - stockInfo.setStockname(warehousingRecord.getWarehouseName()); + stockInfo.setStockName(warehousingRecord.getWarehouseName()); stockInfo = stockInfoMapper.selectStockInfoList(stockInfo).get(0); warehousingRecord.setWarehouseNo(stockInfo.getStockNO()); warehousingRecord.setWarehousingrecordDate(new Date()); diff --git a/ruoyi-admin/src/main/resources/mapper/stock/StockInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/StockInfoMapper.xml index d526065c..aec1e599 100644 --- a/ruoyi-admin/src/main/resources/mapper/stock/StockInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/stock/StockInfoMapper.xml @@ -5,26 +5,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - + + + + + + + + + + - select stock_id, StockNO, Stockname, stockAddr, stockmanager, stockmemo, defalt_itemclass, first_add_time, update_info_time from stock_info + select stock_id, StockNO, Stockname, stockAddr, stockmanager,stock_manager_phone, stockmemo, + defalt_itemclass, first_add_time, update_info_time from stock_info +
  • - +
  • @@ -24,7 +24,7 @@
  • - +
  •  搜索 @@ -69,69 +69,41 @@ exportUrl: prefix + "/export", clickToSelect: true, modalName: "仓库信息", - columns: [{ - checkbox: true - }, - { - field: 'stockId', - title: '仓库id', - visible: false - }, - { - field: 'stockNO', - title: '仓库编号' - }, - { - field: 'stockname', - title: '仓库名' - }, - { - field: 'stockAddr', - title: '仓库地址' - }, - { - field: 'stockmanager', - title: '仓库管理人' - }, - { - field: 'stockmemo', - title: '仓库备注' - }, - { - field: 'firstAddTime', - title: '录入时间', - formatter: function (value, row, index) { - console.log(row) - if (value == null) { - return " "; - } else { - return value; + columns: [ + {checkbox: true}, + {title: '仓库id',field: 'stockId',visible: false}, + {title: '仓库编号',field: 'stockNO',}, + {title: '仓库名',field: 'stockName',}, + {title: '仓库地址',field: 'stockAddr',}, + {title: '仓库管理人',field: 'stockManager',}, + {title: '仓库管理人',field: 'stockManagerPhone',}, + {title: '仓库备注',field: 'stockMemo',}, + {title: '录入时间',field: 'firstAddTime', + formatter: function (value, row, index) { + console.log(row) + if (value == null) {return " ";} + else {return value;} } - } - }, - { - field: 'updateInfoTime', - title: '上次修改时间', - formatter: function (value, row, index) { - if (value == null) { - return " "; - } else { - var vArr = value.split(',') - return vArr[0]; + }, + {title: '上次修改时间',field: 'updateInfoTime', + formatter: function (value, row, index) { + if (value == null) {return " ";} + else { + var vArr = value.split(',') + return vArr[0]; + } } } - } - - // { - // title: '操作', - // align: 'center', - // formatter: function(value, row, index) { - // var actions = []; - // actions.push('编辑 '); - // actions.push('删除'); - // return actions.join(''); - // } - // } + // { + // title: '操作', + // align: 'center', + // formatter: function(value, row, index) { + // var actions = []; + // actions.push('编辑 '); + // actions.push('删除'); + // return actions.join(''); + // } + // } ] }; $.table.init(options);