From ece66065d9f95ac959d4c2b2e692ff3794fb84a2 Mon Sep 17 00:00:00 2001 From: psh Date: Fri, 26 Jul 2024 17:53:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=9E=E6=B8=A9=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=92=8C=E5=8E=9F=E6=96=99=E5=BA=93=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-system/nlsso-server/pom.xml | 20 +- .../java/org/nl/common/utils/FileUtil.java | 46 +- .../wms/mes/domain/QPMES060RequestBody.java | 6 + .../sch/material/service/dao/Material.java | 10 + .../nl/wms/sch/report/ReportController.java | 39 +- .../sch/report/service/IReportService.java | 12 + .../service/dao/mapper/ReportMapper.java | 15 +- .../service/dao/mapper/ReportMapper.xml | 87 ++++ .../nl/wms/sch/report/service/dto/HwDto.java | 33 ++ .../nl/wms/sch/report/service/dto/YlDto.java | 38 ++ .../service/impl/ReportServiceImpl.java | 51 +++ .../sch/task_manage/task/tasks/YCLCKTask.java | 2 + .../sch/task_manage/task/tasks/YCLRKTask.java | 1 + .../src/views/wms/hw/detail/detail.js | 59 +++ .../src/views/wms/hw/detail/index.vue | 413 ++++++++++++++++++ .../src/views/wms/ycl/detail/detail.js | 59 +++ .../src/views/wms/ycl/detail/index.vue | 408 +++++++++++++++++ 17 files changed, 1259 insertions(+), 40 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/YlDto.java create mode 100644 lms/nladmin-ui/src/views/wms/hw/detail/detail.js create mode 100644 lms/nladmin-ui/src/views/wms/hw/detail/index.vue create mode 100644 lms/nladmin-ui/src/views/wms/ycl/detail/detail.js create mode 100644 lms/nladmin-ui/src/views/wms/ycl/detail/index.vue diff --git a/lms/nladmin-system/nlsso-server/pom.xml b/lms/nladmin-system/nlsso-server/pom.xml index e165db1..00f449c 100644 --- a/lms/nladmin-system/nlsso-server/pom.xml +++ b/lms/nladmin-system/nlsso-server/pom.xml @@ -217,30 +217,20 @@ - - com.alibaba - easyexcel - 2.1.6 - - - org.apache.poi - poi-ooxml-schemas - 3.17 - org.apache.poi poi - 3.17 + 4.0.0 org.apache.poi poi-ooxml - 3.17 + 4.0.0 - xerces - xercesImpl - 2.12.0 + org.apache.poi + poi-ooxml-schemas + 4.0.0 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java index a3d9b0a..24d0135 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java @@ -204,27 +204,31 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { /** * 导出excel */ - public static void downloadExcel(List> list, HttpServletResponse response) throws IOException { - String tempPath = SYS_TEM_DIR + IdUtil.fastSimpleUUID() + ".xlsx"; - File file = new File(tempPath); - BigExcelWriter writer = ExcelUtil.getBigWriter(file); - // 一次性写出内容，使用默认样式，强制输出标题 - writer.write(list, true); - SXSSFSheet sheet = (SXSSFSheet)writer.getSheet(); - //上面需要强转SXSSFSheet 不然没有trackAllColumnsForAutoSizing方法 - sheet.trackAllColumnsForAutoSizing(); - //列宽自适应 - writer.autoSizeColumnAll(); - //response为HttpServletResponse对象 - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); - //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码 - response.setHeader("Content-Disposition", "attachment;filename=file.xlsx"); - ServletOutputStream out = response.getOutputStream(); - // 终止后删除临时文件 - file.deleteOnExit(); - writer.flush(out, true); - //此处记得关闭输出Servlet流 - IoUtil.close(out); + public static void downloadExcel(List> list, HttpServletResponse response) { + try { + String tempPath = SYS_TEM_DIR + IdUtil.fastSimpleUUID() + ".xlsx"; + File file = new File(tempPath); + BigExcelWriter writer = ExcelUtil.getBigWriter(file); + // 一次性写出内容，使用默认样式，强制输出标题 + writer.write(list, true); + SXSSFSheet sheet = (SXSSFSheet) writer.getSheet(); + //上面需要强转SXSSFSheet 不然没有trackAllColumnsForAutoSizing方法 + sheet.trackAllColumnsForAutoSizing(); + //列宽自适应 + writer.autoSizeColumnAll(); + //response为HttpServletResponse对象 + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); + //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码 + response.setHeader("Content-Disposition", "attachment;filename=file.xlsx"); + ServletOutputStream out = response.getOutputStream(); + // 终止后删除临时文件 + file.deleteOnExit(); + writer.flush(out, true); + //此处记得关闭输出Servlet流 + IoUtil.close(out); + }catch(IOException e){ + log.error("下载文件失败[][]",e,e.getMessage()); + } } public static String getFileType(String type) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060RequestBody.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060RequestBody.java index d56e928..b749faf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060RequestBody.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060RequestBody.java @@ -1,5 +1,6 @@ package org.nl.wms.mes.domain; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @@ -21,4 +22,9 @@ public class QPMES060RequestBody { private double incomingLength; private double incomingWeight; private double incomingchipping; + private String ingotBatch; + private String siliconGrade; + private String siliconPolarity; + private double weightCoefficientValue; + private String lineDiameter; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/Material.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/Material.java index 8e34b9e..b79f734 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/Material.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/Material.java @@ -58,6 +58,16 @@ public class Material implements Serializable { private String group_bind_material_status; @ApiModelProperty(value = "棒源等级") private String barLevel; + @ApiModelProperty(value = "客户来料批次号") + private String ingotBatch; + @ApiModelProperty(value = "晶棒等级") + private String siliconGrade; + @ApiModelProperty(value = "晶棒等级") + private String siliconPolarity; + @ApiModelProperty(value = "重量") + private String weightCoefficientValue; + @ApiModelProperty(value = "线直径") + private String lineDiameter; public void copyFrom(QPMES060RequestBody source){ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java index 00e0f06..04dd34a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java @@ -2,6 +2,7 @@ package org.nl.wms.sch.report; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -13,6 +14,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; + @Slf4j @RestController @Api(tags = "报表管理") @@ -23,13 +26,38 @@ public class ReportController { private IReportService reportService; @GetMapping - @Log("查询组盘信息管理") - @ApiOperation("查询组盘信息管理") + @Log("查询报表管理") + @ApiOperation("查询报表管理") //@SaCheckPermission("@el.check('material:list')") public ResponseEntity query(ReportQuery whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(reportService.queryAll(whereJson,page)),HttpStatus.OK); } + @GetMapping("/yl/detail") + @Log("原料库库存明细") + @ApiOperation("原料库库存明细") + //@SaCheckPermission("@el.check('material:list')") + public ResponseEntity queryYlDetail(ReportQuery whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(reportService.queryYlDetail(whereJson,page)),HttpStatus.OK); + } + + @GetMapping("/hw/detail") + @Log("回温间库存明细") + @ApiOperation("回温间库存明细") + //@SaCheckPermission("@el.check('material:list')") + public ResponseEntity queryHwDetail(ReportQuery whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(reportService.queryHwDetail(whereJson,page)),HttpStatus.OK); + } + + @SneakyThrows + @GetMapping("/yl/download") + @Log("查询详情导出") + @ApiOperation("查询详情导出") + //@SaCheckPermission("@el.check('material:list')") + public void queryDetailDownload(ReportQuery whereJson, PageQuery page, HttpServletResponse response){ + reportService.queryYlDownload(whereJson,page,response); + } + @GetMapping("/getSupplierNameList") @Log("查询供应商名称列表") @ApiOperation("查询供应商名称列表") @@ -46,5 +74,12 @@ public class ReportController { return new ResponseEntity<>(TableDataInfo.build(reportService.getProductDescriptionList()),HttpStatus.OK); } + @GetMapping("/getLotSNList") + @Log("查询晶棒编号列表") + @ApiOperation("查询晶棒编号列表") + //@SaCheckPermission("@el.check('material:list')") + public ResponseEntity getLotSNList(){ + return new ResponseEntity<>(TableDataInfo.build(reportService.getLotSNList()),HttpStatus.OK); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java index bfac45e..db55ef7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java @@ -3,9 +3,13 @@ package org.nl.wms.sch.report.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; +import org.nl.wms.sch.report.service.dto.HwDto; import org.nl.wms.sch.report.service.dto.ReportDto; import org.nl.wms.sch.report.service.dto.ReportQuery; +import org.nl.wms.sch.report.service.dto.YlDto; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; @@ -19,8 +23,16 @@ public interface IReportService extends IService { */ IPage queryAll(ReportQuery whereJson, PageQuery pageable); + IPage queryHwDetail(ReportQuery whereJson, PageQuery pageable); + + IPage queryYlDetail(ReportQuery whereJson, PageQuery pageable); + + void queryYlDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException; + List getSupplierNameList(); List getProductDescriptionList(); + List getLotSNList(); + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java index 8e6b7d5..17c7e8f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java @@ -3,10 +3,10 @@ package org.nl.wms.sch.report.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Select; -import org.nl.wms.pdm.service.dao.PdmBdWorkorder; -import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; +import org.nl.wms.sch.report.service.dto.HwDto; import org.nl.wms.sch.report.service.dto.ReportDto; import org.nl.wms.sch.report.service.dto.ReportQuery; +import org.nl.wms.sch.report.service.dto.YlDto; import java.util.List; @@ -22,9 +22,20 @@ public interface ReportMapper extends BaseMapper { */ IPage queryReport(IPage pages, ReportQuery query); + /** + * 分页查找 + * @return + */ + IPage queryYlDetail(IPage pages, ReportQuery query); + + IPage queryHwDetail(IPage pages, ReportQuery query); + @Select("select supplierName from sch_base_material group by supplierName") List getSupplierNameList(); @Select("select productDescription from sch_base_material group by productDescription") List getProductDescriptionList(); + + @Select("select lotSN from sch_base_material") + List getLotSNList(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml index 81cbcf6..f951d11 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml @@ -33,4 +33,91 @@ ORDER BY point_code ASC + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java new file mode 100644 index 0000000..77fbd65 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java @@ -0,0 +1,33 @@ +package org.nl.wms.sch.report.service.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class HwDto implements Serializable { + /** 点位编码 */ + private String pointCode; + /** 点位名称 */ + private String pointName; + /** 区域编码 */ + private String regionCode; + /** 区域名称 */ + private String regionName; + /** 子托号 */ + private String subTray; + /** 母拖号 */ + private String motherTray; + /** 物料名称 */ + private String productDescription; + /** 供应商名称 */ + private String supplierName; + /** 入库时间 */ + private String updateTime; + /** 回温时间 */ + private String standingTime; + /** 已回温时间 */ + private String usedTime; + /** 数量 */ + private String number; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/YlDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/YlDto.java new file mode 100644 index 0000000..14f1df8 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/YlDto.java @@ -0,0 +1,38 @@ +package org.nl.wms.sch.report.service.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class YlDto implements Serializable { + /** 点位编码 */ + private String pointCode; + /** 点位名称 */ + private String pointName; + /** 区域编码 */ + private String regionCode; + /** 区域名称 */ + private String regionName; + /** 子托号 */ + private String subTray; + /** 母拖号 */ + private String motherTray; + /** 物料名称 */ + private String productDescription; + /** 供应商名称 */ + private String supplierName; + /** 入库时间 */ + private String updateTime; + /** 棒源等级 */ + private String barLevel; + /** 客户来料批次号 */ + private String ingotBatch; + /** 晶棒号 */ + private String lotSN; + /** 来料长度 */ + private String incomingLength; + /** 来料重量 */ + private String incomingWeight; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java index 6883fbe..511cd63 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java @@ -7,19 +7,27 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.FileUtil; import org.nl.wms.pdm.service.dao.PdmBdWorkorder; import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; import org.nl.wms.sch.material.service.dao.Material; import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; import org.nl.wms.sch.report.service.IReportService; import org.nl.wms.sch.report.service.dao.mapper.ReportMapper; +import org.nl.wms.sch.report.service.dto.HwDto; import org.nl.wms.sch.report.service.dto.ReportDto; import org.nl.wms.sch.report.service.dto.ReportQuery; +import org.nl.wms.sch.report.service.dto.YlDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.nl.common.utils.PageUtil; +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; @Slf4j @Service @@ -33,7 +41,46 @@ public class ReportServiceImpl extends ServiceImpl impl IPage pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize()); pages = reportMapper.queryReport(pages, query); return pages; + } + + @Override + public IPage queryYlDetail(ReportQuery query, PageQuery pageQuery){ + IPage pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize()); + pages = reportMapper.queryYlDetail(pages, query); + return pages; + } + + public IPage queryHwDetail(ReportQuery query, PageQuery pageQuery){ + IPage pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize()); + pages = reportMapper.queryHwDetail(pages, query); + return pages; + } + + @Override + public void queryYlDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException { + pageQuery.setSize(99999); + IPage pages = this.queryYlDetail(query,pageQuery); + List> list = new ArrayList<>(); + for(YlDto detailDto:pages.getRecords()){ + Map mp = new LinkedHashMap<>(); + mp.put("点位编码",detailDto.getPointCode()); + mp.put("点位名称",detailDto.getPointCode()); + mp.put("区域编码",detailDto.getRegionCode()); + mp.put("区域名称",detailDto.getRegionName()); + mp.put("子托号",detailDto.getSubTray()); + mp.put("母拖号",detailDto.getMotherTray()); + mp.put("物料名称",detailDto.getProductDescription()); + mp.put("供应商名称",detailDto.getSupplierName()); + mp.put("入库时间",detailDto.getUpdateTime()); + mp.put("棒源等级",detailDto.getBarLevel()); + mp.put("客户来料批次号",detailDto.getIngotBatch()); + mp.put("晶棒号",detailDto.getLotSN()); + mp.put("来料长度",detailDto.getIncomingLength()); + mp.put("来料重量",detailDto.getIncomingWeight()); + list.add(mp); + } + FileUtil.downloadExcel(list, response); } public List getSupplierNameList(){ @@ -44,5 +91,9 @@ public class ReportServiceImpl extends ServiceImpl impl return reportMapper.getProductDescriptionList(); } + public List getLotSNList(){ + return reportMapper.getLotSNList(); + } + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java index ea765a4..01e302c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java @@ -307,11 +307,13 @@ public class YCLCKTask extends AbstractTask { // 终点解锁 if (ObjectUtil.isNotEmpty(endPointObj)) { endPointObj.setIng_task_code(""); + endPointObj.setUpdate_time(DateUtil.now()); pointService.update(endPointObj); } // 起点解锁 if (ObjectUtil.isNotEmpty(startPointObj)) { startPointObj.setIng_task_code(""); + startPointObj.setUpdate_time(DateUtil.now()); pointService.update(startPointObj); } taskObj.setRemark("任务取消"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java index 5975ce2..8e87cb1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java @@ -179,6 +179,7 @@ public class YCLRKTask extends AbstractTask { endPointObj.setIng_task_code(""); endPointObj.setVehicle_code(taskObj.getVehicle_code()); endPointObj.setVehicle_code2(taskObj.getVehicle_code2()); + endPointObj.setUpdate_time(DateUtil.now()); endPointObj.setVehicle_qty(1); pointService.update(endPointObj); // 要把数据存到组盘表 -> 改造公共方法，返回id diff --git a/lms/nladmin-ui/src/views/wms/hw/detail/detail.js b/lms/nladmin-ui/src/views/wms/hw/detail/detail.js new file mode 100644 index 0000000..5509bb4 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/hw/detail/detail.js @@ -0,0 +1,59 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/report', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/report/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/report', + method: 'put', + data + }) +} + +export function getGroup(data) { + return request({ + url: 'api/report/getGroup', + method: 'post', + data + }) +} + +export function getSupplierNameList(data) { + return request({ + url: 'api/report/getSupplierNameList', + method: 'get', + data + }) +} + +export function getProductDescriptionList(data) { + return request({ + url: 'api/report/getProductDescriptionList', + method: 'get', + data + }) +} + +export function getLotSNList(data) { + return request({ + url: 'api/report/getLotSNList', + method: 'get', + data + }) +} + +export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList } diff --git a/lms/nladmin-ui/src/views/wms/hw/detail/index.vue b/lms/nladmin-ui/src/views/wms/hw/detail/index.vue new file mode 100644 index 0000000..463a2cd --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/hw/detail/index.vue @@ -0,0 +1,413 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/ycl/detail/detail.js b/lms/nladmin-ui/src/views/wms/ycl/detail/detail.js new file mode 100644 index 0000000..5509bb4 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/ycl/detail/detail.js @@ -0,0 +1,59 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/report', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/report/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/report', + method: 'put', + data + }) +} + +export function getGroup(data) { + return request({ + url: 'api/report/getGroup', + method: 'post', + data + }) +} + +export function getSupplierNameList(data) { + return request({ + url: 'api/report/getSupplierNameList', + method: 'get', + data + }) +} + +export function getProductDescriptionList(data) { + return request({ + url: 'api/report/getProductDescriptionList', + method: 'get', + data + }) +} + +export function getLotSNList(data) { + return request({ + url: 'api/report/getLotSNList', + method: 'get', + data + }) +} + +export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList } diff --git a/lms/nladmin-ui/src/views/wms/ycl/detail/index.vue b/lms/nladmin-ui/src/views/wms/ycl/detail/index.vue new file mode 100644 index 0000000..7b4638c --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/ycl/detail/index.vue @@ -0,0 +1,408 @@ + + + + +