From 909766d20e6dd002db7d9dc735cba7a3f82ecd62 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 24 Aug 2023 17:09:51 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E5=8D=8A=E6=88=90=E5=93=81?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/storage_manage/IOSEnum.java | 2 + .../StIvtIostorinvBcpController.java | 24 +++++++++-- .../StIvtIostorinvBcpOutController.java | 9 ++++ .../IStIvtIostorinvBcpOutService.java | 3 ++ .../iostorInv/IStIvtIostorinvBcpService.java | 4 ++ .../iostorInv/dto/BcpIostorInvQuery.java | 2 + .../impl/StIvtIostorinvBcpOutServiceImpl.java | 40 ++++++++++++++++-- .../impl/StIvtIostorinvBcpServiceImpl.java | 41 +++++++++++++++++++ .../semiproduct/semiproductIn/index.vue | 24 +++++++++++ .../semiproduct/semiproductout/index.vue | 23 +++++++++++ 10 files changed, 166 insertions(+), 6 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java index 2f829017..b2f86add 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java @@ -38,6 +38,8 @@ public enum IOSEnum { LOCK_TYPE(MapOf.of("未锁定", "0", "入库锁", "1", "出库锁", "2","盘点锁", "3","损溢锁", "4","拼盘锁","5","其他锁","99")), // 海柔半成品出入库类型 BILL_TYPE_HR(MapOf.of("生产出库", "1001", "盘点出库", "1002", "手工出库", "1009","生产入库","0001")), + // 半成品出入类型 + BILL_TYPE_BCP(MapOf.of("清洗入库", "0001", "手工入库", "0009","生产出库","1001","手工出库","1009")), ; private Map code; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java index f1aa6e77..8045cbcd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java @@ -2,6 +2,7 @@ package org.nl.wms.storage_manage.semimanage.controller.iostorInv; import cn.dev33.satoken.annotation.SaIgnore; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -11,11 +12,17 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.ListOf; +import org.nl.common.utils.MapOf; +import org.nl.modules.common.utils.FileUtil; import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService; import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext; +import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService; import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp; import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery; +import org.nl.wms.storage_manage.semimanage.service.structIvt.dto.StructIvtBcpQuery; +import org.nl.wms.system_manage.service.tableData.ColumnInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -23,10 +30,10 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.math.BigDecimal; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -50,6 +57,9 @@ public class StIvtIostorinvBcpController { @Autowired private IMdPbStoragevehicleextService iMdPbStoragevehicleextService; // 载具扩展属性信息表服务 + @Autowired + private ColumnInfoService columnInfoService; + @GetMapping @Log("查询入库单据") //("查询入库单据") @@ -132,5 +142,13 @@ public class StIvtIostorinvBcpController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + @GetMapping("/download") + @Log("半成品入库单导出") + //("半成品入库单导出") + public ResponseEntity download(BcpIostorInvQuery query, PageQuery page, HttpServletResponse response) throws IOException { + stIvtIostorinvBcpService.download(query,page,response); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java index f396d2bb..9f317654 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java @@ -18,6 +18,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.Map; /** @@ -103,5 +105,12 @@ public class StIvtIostorinvBcpOutController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + @GetMapping("/download") + @Log("半成品出库单导出") + //("半成品出库单导出") + public ResponseEntity download(BcpIostorInvQuery query, PageQuery page, HttpServletResponse response) throws IOException { + bcpOutService.download(query,page,response); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpOutService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpOutService.java index fc4c586e..a427a69b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpOutService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpOutService.java @@ -9,6 +9,8 @@ import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinv import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery; import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; import java.util.Map; @@ -82,4 +84,5 @@ public interface IStIvtIostorinvBcpOutService extends IService { List getPdaAll(JSONObject form); + void download(BcpIostorInvQuery query, PageQuery page, HttpServletResponse response) throws IOException; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dto/BcpIostorInvQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dto/BcpIostorInvQuery.java index e3dd5f4c..485cf87f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dto/BcpIostorInvQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dto/BcpIostorInvQuery.java @@ -26,6 +26,8 @@ public class BcpIostorInvQuery extends BaseQuery { private String io_type; + private String[] createTime; + private Boolean is_delete = false; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java index 073e3c7f..c78c7b41 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.storage_manage.semimanage.service.iostorInv.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; @@ -26,6 +27,7 @@ import org.nl.common.utils.MapOf; import org.nl.common.utils.RedissonUtils; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.FileUtil; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.ext_manage.acs.service.WmsToAcsService; @@ -61,11 +63,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Consumer; /** @@ -558,6 +559,39 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl maps = this.baseMapper.getIostorinv(query); + + List> list = new ArrayList<>(); + for (Map json : maps) { + Map map = new LinkedHashMap<>(); + + map.put("单据号", json.get("bill_code")); + map.put("生产车间", json.get("workshop_id")); + map.put("仓库", json.get("stor_name")); + map.put("业务类型", json.get("bill_type").equals(IOSEnum.BILL_TYPE_BCP.code("生产出库")) ? "生产出库" : "手工出库"); + map.put("业务日期", String.valueOf(json.get("create_time")).substring(0,10)); + map.put("物料编码", json.get("material_code")); + map.put("物料规格", json.get("material_spec")); + map.put("重量(kg)", NumberUtil.round(NumberUtil.div(String.valueOf(json.get("plan_qty")), "1000"), 3)); + map.put("数量(个)", NumberUtil.round(String.valueOf(json.get("qty")), 3)); + map.put("单重", json.get("unit_weight")); + map.put("出库点", json.get("point_code")); + map.put("出库货位", json.get("struct_name")); + map.put("备注", json.get("remark")); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } + private void delTask(String task_id) { StIvtIostorinvBcp mstDao = this.getOne( diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java index 89cebeec..4b7a1d6e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.storage_manage.semimanage.service.iostorInv.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; @@ -23,6 +24,7 @@ import org.nl.common.utils.MapOf; import org.nl.common.utils.RedissonUtils; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.FileUtil; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.ext_manage.acs.service.WmsToAcsService; @@ -54,6 +56,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery; import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService; import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp; +import org.nl.wms.storage_manage.semimanage.service.structIvt.dto.StructIvtBcpQuery; import org.nl.wms.system_manage.service.param.ISysParamService; import org.nl.wms.system_manage.service.param.dao.Param; import org.springframework.beans.factory.annotation.Autowired; @@ -61,6 +64,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.function.Consumer; @@ -423,6 +430,40 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl maps = this.baseMapper.getIostorinv(query); + + List> list = new ArrayList<>(); + for (Map json : maps) { + Map map = new LinkedHashMap<>(); + + map.put("单据号", json.get("bill_code")); + map.put("生产车间", json.get("workshop_id")); + map.put("仓库", json.get("stor_name")); + map.put("业务类型", json.get("bill_type").equals(IOSEnum.BILL_TYPE_BCP.code("清洗入库")) ? "清洗入库" : "手工入库"); + map.put("业务日期", json.get("biz_date")); + map.put("物料编码", json.get("material_code")); + map.put("物料规格", json.get("material_spec")); + map.put("重量(kg)", NumberUtil.round(NumberUtil.div(String.valueOf(json.get("plan_qty")), "1000"), 3)); + map.put("数量(个)", NumberUtil.round(String.valueOf(json.get("qty")), 3)); + map.put("单重", json.get("unit_weight")); + map.put("入库点", json.get("point_code")); + map.put("分配货位", json.get("struct_name")); + map.put("载具号", json.get("storagevehicle_code")); + map.put("备注", json.get("remark")); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } + private void delTask(String task_id) { StIvtIostorinvBcp mstDao = this.getOne( diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/index.vue index 9202d246..4d074cdb 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/index.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/index.vue @@ -134,6 +134,17 @@ > 强制确认 + + 导出 + { + debugger + downloadFile(result, '半成品入库单', 'xlsx') + this.downloading = false + }).catch(() => { + this.downloading = false + }) } } } diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue index 192492f1..91b69a8d 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue @@ -134,6 +134,17 @@ > 强制确认 + + 导出 + { + downloadFile(result, '半成品出库单', 'xlsx') + this.downloading = false + }).catch(() => { + this.downloading = false + }) } } }