From 15fada5d0ddea1bb033dbaa96a424e8fd4e07e2b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 15 Nov 2024 16:24:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8B=86=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui-scm-ui/src/api/disassemble/inquire.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/disassemble/inquire.js b/anrui-scm/anrui-scm-ui/src/api/disassemble/inquire.js index 8b30b99d72..ed74cc9f2c 100644 --- a/anrui-scm/anrui-scm-ui/src/api/disassemble/inquire.js +++ b/anrui-scm/anrui-scm-ui/src/api/disassemble/inquire.js @@ -22,10 +22,20 @@ export default { // 查询分页列表 -- 拆件出入库查询 splitRecordInventoryList: function(data) { return request({ - url: '/wms/apiadmin/inventory/wmsinventory/splitRecordInventoryList', + url: '/apiadmin/inventory/wmsinventoryrecord/splitRecordInventoryList', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } }) + }, + // 拆件出入库查询 -- 导出 + exportExcel: function(data) { + return request({ + url: '/apiadmin/inventory/wmsinventoryrecord/splitRecordExportExcel', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + data: data, + headers: { 'Content-Type': 'application/json' } + }) } } From 535d8ef5a8ad48156f9e603017529993afe6f65e Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 15 Nov 2024 16:25:39 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8B=86=E4=BB=B6=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventroy/WmsInventoryRecordRest.java | 29 +++- .../apiadmin/inventroy/WmsInventoryRest.java | 31 +++- .../wmsinventory/WmsInventoryMapper.xml | 17 +- .../wmsinventory/WmsInventoryQuery.java | 17 +- .../wmsinventory/WmsInventoryService.java | 162 +++++++++++++++--- .../wmsinventory/WmsInventoryVo.java | 9 +- .../wmsinventory/WmsInventoryVoExcelVo.java | 78 +++++---- .../WmsInventoryRecordListVo.java | 6 +- .../WmsInventoryRecordMapper.xml | 95 ++++++---- .../WmsInventoryRecordService.java | 130 +++++++++++--- .../WmsInventoryRecordsExcelVo.java | 42 +++-- .../WmsInventoryRecordsQuery.java | 14 +- .../WmsInventoryRecordsVo.java | 29 +++- 13 files changed, 510 insertions(+), 149 deletions(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java index 3d80031a5e..e282d834a0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java @@ -156,9 +156,18 @@ public class WmsInventoryRecordRest { PagerVo pv = wmsInventoryRecordService.listPage(pagerQuery); return rb.success().setData(pv); } - + @ApiOperation("拆件库出入库查询") + @PostMapping("/splitRecordInventoryList ") + ResultBean> splitRecordInventoryList(@RequestBody PagerQuery pagerQuery){ + ResultBean> rb = ResultBean.fireFail(); + WmsInventoryRecordsQuery params = pagerQuery.getParams(); + params.setType("拆件库"); + pagerQuery.setParams(params); + PagerVo pv = wmsInventoryRecordService.listPage(pagerQuery); + return rb.success().setData(pv); + } @PostMapping("/exportExcel") - @ApiOperation(value = "导出") + @ApiOperation(value = "出入库记录导出") public void exportExcel(@RequestBody WmsInventoryRecordsQuery query) { //得到所有要导出的数据 List exportVoList = wmsInventoryRecordService.listExcel(query); @@ -173,7 +182,23 @@ public class WmsInventoryRecordRest { ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryRecordsExcelVo.class, response); } + @PostMapping("/splitRecordExportExcel") + @ApiOperation(value = "拆件出入库记录导出") + public void splitRecordExportExcel(@RequestBody WmsInventoryRecordsQuery query) { + query.setType("拆件库"); + //得到所有要导出的数据 + List exportVoList = wmsInventoryRecordService.listExcel(query); + //定义导出的excel名字 + String excelName = "拆件出入库查询"; + String fileNameURL = ""; + try { + fileNameURL = URLEncoder.encode(excelName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryRecordsExcelVo.class, response); + } @ApiOperation("新增出入库记录") @PostMapping("/saveInventoryRecord") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java index 1e0bcec063..d49b53bba5 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java @@ -57,7 +57,7 @@ public class WmsInventoryRest { } - @ApiOperation("分页列表") + @ApiOperation("库存查询") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean> rb = ResultBean.fireFail(); @@ -65,6 +65,17 @@ public class WmsInventoryRest { return rb.success().setData(pv); } + @ApiOperation("拆件库存查询") + @PostMapping("/splitInventoryList") + public ResultBean> splitInventoryList(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + WmsInventoryQuery params = pq.getParams(); + params.setType("拆件库"); + pq.setParams(params); + PagerVo pv = wmsInventoryService.listPage(pq); + return rb.success().setData(pv); + } + @ApiOperation("删除/批量删除") @DeleteMapping("/delBySids") ResultBean delBySids(@RequestBody String[] sids) { @@ -128,6 +139,24 @@ public class WmsInventoryRest { } + @PostMapping("/splitInventoryExportExcel") + @ApiOperation(value = "拆件库存导出") + public void splitInventoryExportExcel(@RequestBody WmsInventoryQuery query) { + query.setType("拆件库"); + //得到所有要导出的数据 + List exportVoList = wmsInventoryService.listExcel(query); + //定义导出的excel名字 + String excelName = "库存列表"; + String fileNameURL = ""; + try { + fileNameURL = URLEncoder.encode(excelName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryVoExcelVo.class, response); + + } + @ApiOperation("修改库存数量") @PostMapping("/updateInventoryCount") ResultBean updateInventoryCount(@RequestBody WmsUpdateCountQuery query) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index 653e44cbcc..7b0059b33e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -5,19 +5,26 @@ select wir.goodsID, - wir.goodsSpuName, - wir.goodsSkuCode, - wir.goodsSkuOwnSpec, - wir.warehouseName, - wir.warehouseRackCode, - wir.billNo, - DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime, - wir.busTypeValue, - wir.batchNumber, - wir.billObjName, - wir.currentCount, - wir.count, - wir.unit, - (@rank := @rank + 1) rankNo - from wms_inventory_record wir, - (SELECT @rank := 0) t + wir.goodsSpuName, + wir.goodsSkuCode, + wir.goodsSkuOwnSpec, + wir.warehouseName, + wir.warehouseRackCode, + wir.billNo, + IF(wir.billType = 1,'入库','出库') billType, + DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime, + wir.busTypeValue, + wir.supplierName, + wir.customerName, + wir.manufacturerName, + wir.currentCount, + wir.count, + wir.unit, + wir.handlerName, + wir.cost, + wir.amount, + wir.tax, + wir.guidPrice, + ui.`name` createByName, + (@rank := @rank + 1) rankNo + from wms_inventory_record wir + LEFT JOIN wms_inventory as wi ON wir.inventorySid = wi.sid + LEFT JOIN wms_warehouse_info as i ON wir.warehouseSid = i.sid + LEFT JOIN anrui_portal.sys_organization as s ON wi.useOrgSid = s.sid + LEFT JOIN anrui_portal.sys_user as u ON wir.createBySid = u.sid + LEFT JOIN anrui_portal.sys_staffinfo as ui ON u.staffSid = ui.sid, + (SELECT @rank := 0) t ${ew.sqlSegment} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java index 1ad021eaa2..8b2549c650 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java @@ -30,8 +30,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; +import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo; import com.yxt.wms.biz.inventory.wmsinventoryrecord.report.*; import com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryDetailsListVo; +import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import com.yxt.wms.feign.portal.sysuser.SysUserVo; import org.apache.commons.lang3.StringUtils; @@ -229,6 +231,44 @@ public class WmsInventoryRecordService extends MybatisBaseService listPage(PagerQuery pagerQuery) { WmsInventoryRecordsQuery query = pagerQuery.getParams(); QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(query.getMenuUrl())) { + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("wir.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } //ToDo:添加查询条件 if (StringUtils.isNotBlank(query.getGoodsID())) { qw.like("wir.goodsID", query.getGoodsID()); @@ -249,13 +289,9 @@ public class WmsInventoryRecordService extends MybatisBaseService= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). - apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (wir.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" + apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (wir.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" ); - IPage page = PagerUtil.queryToPage(pagerQuery); - IPage pagging = baseMapper.listPage(page, qw); - for (WmsInventoryRecordsVo record : pagging.getRecords()) { - if (StringUtils.isNotBlank(record.getCreateBySid())) { - SysUserVo sysUserVo = sysUserFeign.fetchBySid(record.getCreateBySid()).getData(); - record.setCreateByName(sysUserVo.getName()); + //操作人 + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.like("ui.`name`", query.getCreateByName()); + } + //经办人 + if (StringUtils.isNotBlank(query.getHandlerName())) { + qw.like("wir.handlerName", query.getHandlerName()); + } + if (StringUtils.isNotBlank(query.getType())) { + if (query.getType().equals("拆件库")) { + qw.eq("i.warehouseTypeValue", "拆件库"); } } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } public List listExcel(WmsInventoryRecordsQuery query) { QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(query.getMenuUrl())) { + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("wir.createBySid", query.getUserSid()); + } else { + return new ArrayList<>(); + } + } else { + return new ArrayList<>(); + } + } //ToDo:添加查询条件 if (StringUtils.isNotBlank(query.getGoodsID())) { qw.like("wir.goodsID", query.getGoodsID()); @@ -307,13 +386,9 @@ public class WmsInventoryRecordService extends MybatisBaseService= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (wir.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" ); + //操作人 + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.like("ui.`name`", query.getCreateByName()); + } + //经办人 + if (StringUtils.isNotBlank(query.getHandlerName())) { + qw.like("wir.handlerName", query.getHandlerName()); + } + if (StringUtils.isNotBlank(query.getType())) { + if (query.getType().equals("拆件库")) { + qw.eq("i.warehouseTypeValue", "拆件库"); + } + } List list = baseMapper.listExcel(qw); list.removeAll(Collections.singleton(null)); return list; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsExcelVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsExcelVo.java index 4b67ca4957..490598ea34 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsExcelVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsExcelVo.java @@ -22,7 +22,7 @@ public class WmsInventoryRecordsExcelVo { @ExportEntityMap(CnName = "商品名称", EnName = "goodsSpuName") private String goodsSpuName; @ApiModelProperty("商品编码") - @ExportEntityMap(CnName = "商品编码", EnName = "goodsSkuCode") + @ExportEntityMap(CnName = "图号", EnName = "goodsSkuCode") private String goodsSkuCode; @ApiModelProperty("规格") @ExportEntityMap(CnName = "规格", EnName = "goodsSkuOwnSpec") @@ -39,9 +39,7 @@ public class WmsInventoryRecordsExcelVo { @ApiModelProperty("来源单号") @ExportEntityMap(CnName = "来源单号", EnName = "billNo") private String billNo; - - - @ApiModelProperty("单据类型（1入库、0出库）") + @ApiModelProperty("单据类型（1入库、0出库）") @ExportEntityMap(CnName = "单据类型", EnName = "billType") private String billType; @ExportEntityMap(CnName = "发生时间", EnName = "createTime") @@ -49,18 +47,38 @@ public class WmsInventoryRecordsExcelVo { @ApiModelProperty("业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等）") @ExportEntityMap(CnName = "业务类型", EnName = "busTypeValue") private String busTypeValue; - @ApiModelProperty("客户/供应商名称") - @ExportEntityMap(CnName = "客户/供应商名称", EnName = "billObjName") - private String billObjName; - @ApiModelProperty("批次号") - @ExportEntityMap(CnName = "批次号", EnName = "batchNumber") - private String batchNumber; - @ApiModelProperty("数量") + @ApiModelProperty("供应商") + @ExportEntityMap(CnName = "供应商", EnName = "supplierName") + private String supplierName; + @ExportEntityMap(CnName = "客户", EnName = "customerName") + private String customerName; @ExportEntityMap(CnName = "数量", EnName = "count") private String count; @ApiModelProperty("出入库后的库存量") - @ExportEntityMap(CnName = "出入库后的库存量", EnName = "currentCount") + @ExportEntityMap(CnName = "出入库后的库存", EnName = "currentCount") private String currentCount; + @ApiModelProperty("出入库单价") + @ExportEntityMap(CnName = "出入库单价", EnName = "cost") + private String cost; + @ApiModelProperty("出入库金额 ") + @ExportEntityMap(CnName = "出入库金额", EnName = "amount") + private String amount; + @ApiModelProperty("税率") + @ExportEntityMap(CnName = "税率", EnName = "tax") + private String tax; + @ApiModelProperty("销售指导价") + @ExportEntityMap(CnName = "销售指导价", EnName = "guidPrice") + private String guidPrice; + + @ApiModelProperty("操作人") + @ExportEntityMap(CnName = "操作人", EnName = "createByName") + private String createByName; + @ApiModelProperty("经办人") + @ExportEntityMap(CnName = "经办人（领料人/退料人）", EnName = "handlerName") + private String handlerName; + + + } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsQuery.java index dbe71e0216..1cd8dc619c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsQuery.java @@ -22,8 +22,10 @@ public class WmsInventoryRecordsQuery implements Query { private String warehouseName; @ApiModelProperty("库位编号") private String warehouseRackCode; - @ApiModelProperty("客户/供应商名称") - private String billObjName; + @ApiModelProperty("厂家") + private String manufacturerName; + @ApiModelProperty("供应商") + private String supplierName; @ApiModelProperty("批次号") private String batchNumber; @ApiModelProperty("来源单据编号") @@ -36,4 +38,12 @@ public class WmsInventoryRecordsQuery implements Query { private String createTimeStart; @ApiModelProperty("发生结束时间") private String createTimeEnd; + @ApiModelProperty("操作人") + private String createByName; + @ApiModelProperty("经办人") + private String handlerName; + private String menuUrl; + private String orgPath; + private String userSid; + private String type; //库存类型 } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsVo.java index 7552822063..d313fa04fd 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsVo.java @@ -21,12 +21,14 @@ public class WmsInventoryRecordsVo { private String goodsSkuCode; @ApiModelProperty("规格型号") private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; @ApiModelProperty("仓库名称") private String warehouseName; - @ApiModelProperty("库区名称") - private String warehouseAreaName; @ApiModelProperty("库位编号") private String warehouseRackCode; + @ApiModelProperty("库区名称") + private String warehouseAreaName; @ApiModelProperty("来源单据编号") private String billNo; @ApiModelProperty("单据类型（1入库、0出库）") @@ -34,18 +36,27 @@ public class WmsInventoryRecordsVo { private String createTime; @ApiModelProperty("业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等）") private String busTypeValue; - @ApiModelProperty("客户/供应商名称") - private String billObjName; - @ApiModelProperty("批次号") - private String batchNumber; + @ApiModelProperty("厂家") + private String manufacturerName; + @ApiModelProperty("供应商") + private String supplierName; + @ApiModelProperty("客户") + private String customerName; @ApiModelProperty("出入库后的库存量") private String currentCount; @ApiModelProperty("数量") private String count; - @ApiModelProperty("计量单位") - private String unit; + + @ApiModelProperty("出入库单价") + private String cost; + @ApiModelProperty("出入库金额 ") + private String amount; + @ApiModelProperty("税率") + private String tax; + @ApiModelProperty("销售指导价") + private String guidPrice; + @ApiModelProperty("操作人") - private String createBySid; private String createByName; @ApiModelProperty("经办人") private String handlerName; From b350aeaf920b4c2aaebf2f0c9efeb90b41073108 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 15 Nov 2024 16:35:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=93=E5=82=A8--?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/api/storage/inventory.js | 10 +++++++ .../src/views/storage/inventory/inventory.vue | 26 ++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/yxt-as-ui/src/api/storage/inventory.js b/yxt-as-ui/src/api/storage/inventory.js index d71cfd976b..24cf8686c8 100644 --- a/yxt-as-ui/src/api/storage/inventory.js +++ b/yxt-as-ui/src/api/storage/inventory.js @@ -19,6 +19,16 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + // 库存查询 -- 导出 + exportExcelByInventory: function(data) { + return request({ + url: '/wms/apiadmin/inventory/wmsinventory/exportExcel', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, // 库存出入库记录 getWmsInventoryRecordList: function(data) { return request({ diff --git a/yxt-as-ui/src/views/storage/inventory/inventory.vue b/yxt-as-ui/src/views/storage/inventory/inventory.vue index 56cc19050e..120e3b1891 100644 --- a/yxt-as-ui/src/views/storage/inventory/inventory.vue +++ b/yxt-as-ui/src/views/storage/inventory/inventory.vue @@ -270,7 +270,31 @@ export default { this.$refs['divCRK'].showInfo(row) }, toCarry() {}, - doExport() {}, + doExport() { + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + req.exportExcelByInventory(this.listQuery.params).then((resp) => { + loading.close() + const blob = new Blob([resp], { + type: 'application/vnd.ms-excel' + }) + const fileName = '库存表' + '.xls' + const elink = document.createElement('a') + elink.download = fileName + elink.style.display = 'nonde' + elink.href = URL.createObjectURL(blob) + document.body.appendChild(elink) + elink.click() + URL.revokeObjectURL(elink.href) + document.body.removeChild(elink) + }).catch(() => { + loading.close() + }) + }, doDel() { if (this.sids.length === 0) { this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' }) From 9ae650b43f7f5d1cba815c44baf5deede14ca85b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 15 Nov 2024 16:37:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8B=86=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/disassemble/inquire.js | 10 +++++++ .../views/disassemble/inquire/inventory.vue | 26 ++++++++++++++++++- .../src/views/disassemble/inquire/plug.vue | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/disassemble/inquire.js b/anrui-scm/anrui-scm-ui/src/api/disassemble/inquire.js index ed74cc9f2c..c8a6506532 100644 --- a/anrui-scm/anrui-scm-ui/src/api/disassemble/inquire.js +++ b/anrui-scm/anrui-scm-ui/src/api/disassemble/inquire.js @@ -11,6 +11,16 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + // 拆件库存查询 -- 导出 + splitInventoryExportExcel: function(data) { + return request({ + url: '/wms/apiadmin/inventory/wmsinventory/splitInventoryExportExcel', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, // 库存出入库记录 getWmsInventoryRecordList: function(data) { return request({ diff --git a/anrui-scm/anrui-scm-ui/src/views/disassemble/inquire/inventory.vue b/anrui-scm/anrui-scm-ui/src/views/disassemble/inquire/inventory.vue index 659de23847..9601d5d066 100644 --- a/anrui-scm/anrui-scm-ui/src/views/disassemble/inquire/inventory.vue +++ b/anrui-scm/anrui-scm-ui/src/views/disassemble/inquire/inventory.vue @@ -259,7 +259,31 @@ export default { this.viewState = 2 this.$refs['divCRK'].showInfo(row) }, - doExport() {}, + doExport() { + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + req.splitInventoryExportExcel(this.listQuery.params).then((resp) => { + loading.close() + const blob = new Blob([resp], { + type: 'application/vnd.ms-excel' + }) + const fileName = '拆件库存表' + '.xls' + const elink = document.createElement('a') + elink.download = fileName + elink.style.display = 'nonde' + elink.href = URL.createObjectURL(blob) + document.body.appendChild(elink) + elink.click() + URL.revokeObjectURL(elink.href) + document.body.removeChild(elink) + }).catch(() => { + loading.close() + }) + }, doDel() { if (this.sids.length === 0) { this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' }) diff --git a/anrui-scm/anrui-scm-ui/src/views/disassemble/inquire/plug.vue b/anrui-scm/anrui-scm-ui/src/views/disassemble/inquire/plug.vue index 872a96593a..f247c6c16a 100644 --- a/anrui-scm/anrui-scm-ui/src/views/disassemble/inquire/plug.vue +++ b/anrui-scm/anrui-scm-ui/src/views/disassemble/inquire/plug.vue @@ -269,7 +269,7 @@ export default { const blob = new Blob([resp], { type: 'application/vnd.ms-excel' }) - const fileName = '出入库记录' + '.xls' + const fileName = '拆件出入库记录' + '.xls' const elink = document.createElement('a') elink.download = fileName elink.style.display = 'nonde' From 9b0bedbf0567d5674bcd908fb04da4476975b6ce Mon Sep 17 00:00:00 2001 From: myTest383
Date: Fri, 15 Nov 2024 17:15:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=20=E5=90=88=E4=BD=9C?= =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicinformation/secondaryCooperativeStation.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yxt-as-ui/src/api/basicinformation/secondaryCooperativeStation.js b/yxt-as-ui/src/api/basicinformation/secondaryCooperativeStation.js index 8a60b78450..68c589d5c4 100644 --- a/yxt-as-ui/src/api/basicinformation/secondaryCooperativeStation.js +++ b/yxt-as-ui/src/api/basicinformation/secondaryCooperativeStation.js @@ -4,7 +4,7 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + // baseURL: "http://127.0.0.1:4523/m1/613533-0-default", url: '/as/v1/secondaryCooperativeStation/listPage', method: 'post', data: params, @@ -27,14 +27,14 @@ export default { // 回显 fetchDetailsBySid: function(data) { return request({ - baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + // baseURL: "http://127.0.0.1:4523/m1/613533-0-default", url: '/as/v1/secondaryCooperativeStation/fetchDetailsBySid/' + data, method: 'get' }) }, saveOrUpdate: function(data) { return request({ - baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + // baseURL: "http://127.0.0.1:4523/m1/613533-0-default", url: '/as/v1/secondaryCooperativeStation/save', method: 'post', data: data, @@ -45,7 +45,7 @@ export default { }, deleteBySids: function(data) { return request({ - baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + // baseURL: "http://127.0.0.1:4523/m1/613533-0-default", url: '/as/v1/secondaryCooperativeStation/delBySids', method: 'DELETE', data: data, @@ -57,7 +57,7 @@ export default { // 提交流程 submit: function(params) { return request({ - baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + // baseURL: "http://127.0.0.1:4523/m1/613533-0-default", url: '/as/v1/secondaryCooperativeStation/submit', method: 'post', data: params,