root/yiBinGaoCe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

所有报表加导出

Browse Source
This commit is contained in:
zds
2024-12-18 19:11:15 +08:00
parent c584d2c196
commit acaf6f96a0
21 changed files with 332 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/controller/MaterialController.java
View File

@@ -3,6 +3,7 @@ package org.nl.wms.sch.material.controller;
import com.alibaba.fastjson.JSONObject;
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;
@@ -10,6 +11,7 @@ import org.nl.common.logging.annotation.Log;
import org.nl.wms.sch.material.service.IMaterialService;
import org.nl.wms.sch.material.service.dao.Material;
import org.nl.wms.sch.material.service.dto.MaterialQuery;
import org.nl.wms.sch.report.service.dto.ReportQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -22,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.Set;
/**
@@ -38,8 +41,8 @@ public class MaterialController {
private IMaterialService materialService;
@GetMapping
@Log("查询组盘信息管理")
@ApiOperation("查询组盘信息管理")
@Log("查询原材料入库记录")
@ApiOperation("查询原材料入库记录")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> query(MaterialQuery whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(materialService.queryAll(whereJson,page)),HttpStatus.OK);
@@ -54,7 +57,13 @@ public class MaterialController {
return new ResponseEntity<>(HttpStatus.CREATED);
}
@SneakyThrows
@GetMapping("/download")
@Log("原材料入库导出")
@ApiOperation("原材料入库导出")
public void queryDownload(MaterialQuery whereJson, PageQuery page, HttpServletResponse response){
materialService.queryDownload(whereJson,page,response);
}
@Log("删除组盘信息管理")
@ApiOperation("删除组盘信息管理")

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/IMaterialService.java
View File

@@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.sch.material.service.dao.Material;
import org.nl.wms.sch.material.service.dto.MaterialQuery;
import org.nl.wms.sch.report.service.dto.ReportQuery;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Set;
@@ -26,6 +29,7 @@ public interface IMaterialService extends IService<Material> {
*/
void create(Material entity);
void queryDownload(MaterialQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
/**
* 多选删除

49
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java
View File

@@ -9,15 +9,20 @@ 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.common.utils.SecurityUtils;
import org.nl.wms.sch.material.service.IMaterialService;
import org.nl.wms.sch.material.service.dao.Material;
import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper;
import org.nl.wms.sch.material.service.dto.MaterialQuery;
import org.nl.wms.sch.report.service.dto.HwDto;
import org.nl.wms.sch.report.service.dto.ReportQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Set;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
@Slf4j
@Service
@@ -42,6 +47,48 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
return pages;
}
@Override
public void queryDownload(MaterialQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
IPage<Material> pages = this.queryAll(query,pageQuery);
List<Map<String, Object>> list = new ArrayList<>();
for(Material detailDto:pages.getRecords()){
Map<String, Object> mp = new LinkedHashMap<>();
mp.put("入库单号",detailDto.getSimtOrderNo());
mp.put("场地",detailDto.getLocationCode());
mp.put("入库类型",detailDto.getSimtType());
mp.put("到货单号",detailDto.getDeliveryNo());
mp.put("扫描库位",detailDto.getWhlCode());
mp.put("托盘号",detailDto.getPalletSN());
mp.put("物料条码号",detailDto.getLotSN());
mp.put("物料编码",detailDto.getProductName());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("供应商名称",detailDto.getSupplierName());
mp.put("供应商编码",detailDto.getSupplierCode());
mp.put("规格",detailDto.getSpecification());
mp.put("批次号",detailDto.getBatch());
mp.put("数量",detailDto.getQty());
mp.put("来料长度",detailDto.getIncomingLength());
mp.put("来料重量",detailDto.getIncomingWeight());
mp.put("来料缺陷长度",detailDto.getIncomingchipping());
if("1".equals(detailDto.getGroup_bind_material_status())){
mp.put("绑定状态","待绑定");
}else if("2".equals(detailDto.getGroup_bind_material_status())){
mp.put("绑定状态","已绑定");
}else if("3".equals(detailDto.getGroup_bind_material_status())){
mp.put("绑定状态","已解绑");
}
if("1".equals(detailDto.getReturn_status())){
mp.put("回传状态","已入库回传");
}else{
mp.put("回传状态","未回传");
}
mp.put("创建时间",detailDto.getCreate_time());
list.add(mp);
}
FileUtil.downloadExcel(list, response);
}
@Override
public void create(Material entity) {
materialMapper.insert(entity);

34
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java
View File

@@ -33,7 +33,13 @@ public class ReportController {
public ResponseEntity<Object> query(ReportQuery whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(reportService.queryAll(whereJson,page)),HttpStatus.OK);
}
@SneakyThrows
@GetMapping("/download")
@Log("导出")
@ApiOperation("导出")
public void queryDownload(ReportQuery whereJson, PageQuery page, HttpServletResponse response){
reportService.queryDownload(whereJson,page,response);
}
@GetMapping("/yl/detail")
@Log("原料库库存明细")
@ApiOperation("原料库库存明细")
@@ -43,9 +49,8 @@ public class ReportController {
}
@GetMapping("/yl/outdetail")
@Log("原料库工单库存明细")
@ApiOperation("原料库工单库存明细")
//@SaCheckPermission("@el.check('material:list')")
@Log("原料库工单出库")
@ApiOperation("原料库工单出库")
public ResponseEntity<Object> queryYlOutDetail(ReportQuery whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(reportService.queryYlOutDetail(whereJson,page)),HttpStatus.OK);
}
@@ -124,13 +129,20 @@ public class ReportController {
@SneakyThrows
@GetMapping("/yl/detail/download")
@Log("查询详情导出")
@ApiOperation("查询详情导出")
//@SaCheckPermission("@el.check('material:list')")
@Log("晶棒库库存明细详情导出")
@ApiOperation("晶棒库库存明细详情导出")
public void queryYlDetailDownload(ReportQuery whereJson, PageQuery page, HttpServletResponse response){
reportService.queryYlDetailDownload(whereJson,page,response);
}
@SneakyThrows
@GetMapping("/yl/outdetail/download")
@Log("晶棒库工单出库导出")
@ApiOperation("晶棒库工单出库导出")
public void queryYlOutDetailDownload(ReportQuery whereJson, PageQuery page, HttpServletResponse response){
reportService.queryYlOutDetailDownload(whereJson,page,response);
}
@SneakyThrows
@GetMapping("/yl/in/download")
@Log("查询详情导出")
@@ -175,6 +187,14 @@ public class ReportController {
reportService.queryHwInPendingDownload(whereJson,page,response);
}
@SneakyThrows
@GetMapping("/yl/movedetail2/download")
@Log("回温区移库快速回温区导出")
@ApiOperation("回温区移库快速回温区导出")
public void queryMoveDetail2Download(ReportQuery whereJson, PageQuery page, HttpServletResponse response){
reportService.queryMoveDetail2Download(whereJson,page,response);
}
@SneakyThrows
@GetMapping("/hw/out/download")
@Log("查询详情导出")

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java
View File

@@ -91,7 +91,7 @@ public interface IReportService extends IService<ReportDto> {
* @param pageable
* @return
*/
IPage<YCLKCDto> queryMoveDetail2(ReportQuery whereJson, PageQuery pageable);
IPage<HwDto> queryMoveDetail2(ReportQuery whereJson, PageQuery pageable);
/**
* 原材入库明细--------
@@ -109,8 +109,12 @@ public interface IReportService extends IService<ReportDto> {
*/
IPage<YlDto> queryYlOut(ReportQuery whereJson, PageQuery pageable);
void queryDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
void queryYlDetailDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
void queryYlOutDetailDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
void queryYlInDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
void queryYlOutDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
@@ -121,6 +125,8 @@ public interface IReportService extends IService<ReportDto> {
void queryHwInPendingDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
void queryMoveDetail2Download(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
void queryHwOutDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
void queryHwOutPendingDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java
View File

@@ -29,7 +29,7 @@ public interface ReportMapper extends BaseMapper<ReportDto> {
IPage<YCLKCDto> queryMoveDetail(IPage<YCLKCDto> pages, ReportQuery query);
IPage<YCLKCDto> queryMoveDetail2(IPage<YCLKCDto> pages, ReportQuery query);
IPage<HwDto> queryMoveDetail2(IPage<HwDto> pages, ReportQuery query);
IPage<YlDto> queryYlIn(IPage<YlDto> pages, ReportQuery query);

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/YCLKCDto.java
View File

@@ -34,5 +34,9 @@ public class YCLKCDto implements Serializable {
private String ingotBatch;
/** 数量 */
private String number;
/** 客户来料批次号 */
private String standingTime;
/** 数量 */
private String usedTime;
}

197
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java
View File

@@ -73,8 +73,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
}
@Override
public IPage<YCLKCDto> queryMoveDetail2(ReportQuery query, PageQuery pageQuery){
IPage<YCLKCDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
public IPage<HwDto> queryMoveDetail2(ReportQuery query, PageQuery pageQuery){
IPage<HwDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
pages = reportMapper.queryMoveDetail2(pages, query);
return pages;
}
@@ -123,7 +123,26 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
pages = reportMapper.queryHwOutPending(pages, query);
return pages;
}
@Override
public void queryDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
IPage<ReportDto> pages = this.queryAll(query,pageQuery);
List<Map<String, Object>> list = new ArrayList<>();
for(ReportDto detailDto:pages.getRecords()){
Map<String, Object> 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.getSupplierName());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("批次",detailDto.getIngotBatch());
list.add(mp);
}
FileUtil.downloadExcel(list, response);
}
@Override
public void queryYlDetailDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
@@ -137,25 +156,64 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
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.getSiliconGrade());
mp.put("客户来料批次号",detailDto.getIngotBatch());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("物料编码",detailDto.getProductName());
if("1".equals(detailDto.getStatus())){
mp.put("出库状态","出库中");
}else{
mp.put("出库状态","未出库");
}
mp.put("工单编号",detailDto.getMoname());
mp.put("晶棒号",detailDto.getLotSN());
mp.put("晶体编号",detailDto.getLotSN());
mp.put("来料批次号",detailDto.getIngotBatch());
mp.put("棒源等级",detailDto.getSiliconGrade());
mp.put("入库时间",detailDto.getUpdateTime());
mp.put("重量KG",detailDto.getIncomingWeight());
mp.put("折算系数",detailDto.getWeightCoefficientValue());
mp.put("来料长度",detailDto.getIncomingLength());
mp.put("来料重量",detailDto.getIncomingWeight());
mp.put("来料缺陷长度mm",detailDto.getIncomingchipping());
mp.put("有效长度mm",Double.parseDouble(detailDto.getIncomingLength()) - Double.parseDouble(detailDto.getIncomingchipping()));
list.add(mp);
}
FileUtil.downloadExcel(list, response);
}
@Override
public void queryYlOutDetailDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
IPage<YCLKCDto> pages = this.queryYlOutDetail(query,pageQuery);
List<Map<String, Object>> list = new ArrayList<>();
for(YCLKCDto detailDto:pages.getRecords()){
Map<String, Object> mp = new LinkedHashMap<>();
mp.put("点位名称",detailDto.getPointCode());
mp.put("区域名称",detailDto.getRegionName());
mp.put("子托号",detailDto.getSubTray());
mp.put("母拖号",detailDto.getMotherTray());
mp.put("工单编号",detailDto.getMoname());
if("0".equals(detailDto.getStatus())){
mp.put("工单状态","未提交");
}else if("1".equals(detailDto.getStatus())){
mp.put("工单状态","已提交");
}else if("2".equals(detailDto.getStatus())){
mp.put("工单状态","出库中");
}else if("3".equals(detailDto.getStatus())){
mp.put("工单状态","已出库");
}else if("4".equals(detailDto.getStatus())){
mp.put("工单状态","已出库回传");
}
mp.put("供应商名称",detailDto.getSupplierName());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("来料批次号",detailDto.getIngotBatch());
mp.put("棒源等级",detailDto.getSiliconGrade());
mp.put("每托数量(根)",detailDto.getNumber());
mp.put("入库时间",detailDto.getUpdateTime());
list.add(mp);
}
FileUtil.downloadExcel(list, response);
}
@Override
public void queryYlInDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
@@ -169,14 +227,19 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
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.getProductDescription());
mp.put("物料编码",detailDto.getProductName());
mp.put("晶体编号",detailDto.getLotSN());
mp.put("来料批次号",detailDto.getIngotBatch());
mp.put("棒源等级",detailDto.getSiliconGrade());
mp.put("客户来料批次号",detailDto.getIngotBatch());
mp.put("晶棒号",detailDto.getLotSN());
mp.put("来料长度",detailDto.getIncomingLength());
mp.put("来料重量",detailDto.getIncomingWeight());
mp.put("入库时间",detailDto.getUpdateTime());
mp.put("重量KG",detailDto.getIncomingWeight());
mp.put("折算系数",detailDto.getWeightCoefficientValue());
mp.put("来料长度mm",detailDto.getIncomingLength());
mp.put("来料缺陷长度mm",detailDto.getIncomingchipping());
mp.put("有效长度mm",Double.parseDouble(detailDto.getIncomingLength()) - Double.parseDouble(detailDto.getIncomingchipping()));
list.add(mp);
}
FileUtil.downloadExcel(list, response);
@@ -195,14 +258,19 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
mp.put("目的区域名称",detailDto.getRegionName2());
mp.put("子托号",detailDto.getSubTray());
mp.put("母拖号",detailDto.getMotherTray());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("供应商名称",detailDto.getSupplierName());
mp.put("出库时间",detailDto.getUpdateTime());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("物料编码",detailDto.getProductName());
mp.put("晶体编号",detailDto.getLotSN());
mp.put("来料批次号",detailDto.getIngotBatch());
mp.put("棒源等级",detailDto.getSiliconGrade());
mp.put("客户来料批次号",detailDto.getIngotBatch());
mp.put("晶棒号",detailDto.getLotSN());
mp.put("来料长度",detailDto.getIncomingLength());
mp.put("来料重量",detailDto.getIncomingWeight());
mp.put("出库时间",detailDto.getUpdateTime());
mp.put("重量KG",detailDto.getIncomingWeight());
mp.put("折算系数",detailDto.getWeightCoefficientValue());
mp.put("来料长度mm",detailDto.getIncomingLength());
mp.put("来料缺陷长度mm",detailDto.getIncomingchipping());
mp.put("有效长度mm",Double.parseDouble(detailDto.getIncomingLength()) - Double.parseDouble(detailDto.getIncomingchipping()));
list.add(mp);
}
FileUtil.downloadExcel(list, response);
@@ -219,14 +287,19 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
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.getProductDescription());
mp.put("来料批次号",detailDto.getIngotBatch());
mp.put("棒源等级",detailDto.getSiliconGrade());
mp.put("客户来料批次号",detailDto.getIngotBatch());
mp.put("回温时间",detailDto.getStandingTime());
mp.put("已回温时间",detailDto.getUsedTime());
mp.put("每托数量(根)",detailDto.getNumber());
mp.put("入库时间",detailDto.getUpdateTime());
mp.put("回温时间H",detailDto.getStandingTime());
mp.put("已回温时间H",detailDto.getUsedTime());
if((Double.parseDouble(detailDto.getStandingTime()) - Double.parseDouble(detailDto.getUsedTime()))>0){
mp.put("是否完成","未完成");
}else{
mp.put("是否完成","已完成");
}
list.add(mp);
}
FileUtil.downloadExcel(list, response);
@@ -241,15 +314,15 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
Map<String, Object> mp = new LinkedHashMap<>();
mp.put("点位编码",detailDto.getPointCode());
mp.put("区域名称",detailDto.getRegionName());
mp.put("子托号",detailDto.getSubTray());
mp.put("母拖号",detailDto.getMotherTray());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("子托编码",detailDto.getSubTray());
mp.put("母托编码",detailDto.getMotherTray());
mp.put("供应商名称",detailDto.getSupplierName());
mp.put("入库时间",detailDto.getUpdateTime());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("来料批次号",detailDto.getIngotBatch());
mp.put("棒源等级",detailDto.getSiliconGrade());
mp.put("客户来料批次号",detailDto.getIngotBatch());
mp.put("已回温时间",detailDto.getUsedTime());
mp.put("每托数量(根)",detailDto.getNumber());
mp.put("入库时间",detailDto.getUpdateTime());
mp.put("已回温时间H",detailDto.getUsedTime());
list.add(mp);
}
FileUtil.downloadExcel(list, response);
@@ -264,19 +337,46 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
Map<String, Object> mp = new LinkedHashMap<>();
mp.put("待入库点位编码",detailDto.getPointCode());
mp.put("待入库区域名称",detailDto.getRegionName());
mp.put("子托号",detailDto.getSubTray());
mp.put("母拖号",detailDto.getMotherTray());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("子托编码",detailDto.getSubTray());
mp.put("母托编码",detailDto.getMotherTray());
mp.put("供应商名称",detailDto.getSupplierName());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("来料批次号",detailDto.getIngotBatch());
mp.put("棒源等级",detailDto.getSiliconGrade());
mp.put("客户来料批次号",detailDto.getIngotBatch());
mp.put("每托数量(根)",detailDto.getNumber());
mp.put("更新时间",detailDto.getUpdateTime());
list.add(mp);
}
FileUtil.downloadExcel(list, response);
}
@Override
public void queryMoveDetail2Download(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
IPage<HwDto> pages = this.queryMoveDetail2(query,pageQuery);
List<Map<String, Object>> list = new ArrayList<>();
for(HwDto detailDto:pages.getRecords()){
Map<String, Object> mp = new LinkedHashMap<>();
mp.put("点位编码",detailDto.getPointCode());
mp.put("区域名称",detailDto.getRegionName());
mp.put("子托编码",detailDto.getSubTray());
mp.put("母托编码",detailDto.getMotherTray());
if("1".equals(detailDto.getStatus())){
mp.put("提交状态","已提交");
}else{
mp.put("提交状态","未提交");
}
mp.put("供应商名称",detailDto.getSupplierName());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("来料批次号",detailDto.getIngotBatch());
mp.put("棒源等级",detailDto.getSiliconGrade());
mp.put("每托数量(根)",detailDto.getNumber());
mp.put("入库时间",detailDto.getUpdateTime());
mp.put("回温时间H",detailDto.getStandingTime());
mp.put("已回温时间H",detailDto.getUsedTime());
list.add(mp);
}
FileUtil.downloadExcel(list, response);
}
@Override
public void queryHwOutDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
@@ -290,14 +390,19 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
mp.put("目的区域名称",detailDto.getRegionName2());
mp.put("子托号",detailDto.getSubTray());
mp.put("母拖号",detailDto.getMotherTray());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("供应商名称",detailDto.getSupplierName());
mp.put("出库时间",detailDto.getUpdateTime());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("来料批次号",detailDto.getIngotBatch());
mp.put("棒源等级",detailDto.getSiliconGrade());
mp.put("客户来料批次号",detailDto.getIngotBatch());
mp.put("回温时间",detailDto.getStandingTime());
mp.put("已回温时间",detailDto.getUsedTime());
mp.put("每托数量(根)",detailDto.getNumber());
mp.put("出库时间",detailDto.getUpdateTime());
mp.put("回温时间H",detailDto.getStandingTime());
mp.put("已回温时间H",detailDto.getUsedTime());
if((Double.parseDouble(detailDto.getStandingTime()) - Double.parseDouble(detailDto.getUsedTime()))>0){
mp.put("是否完成","未完成");
}else{
mp.put("是否完成","已完成");
}
list.add(mp);
}
FileUtil.downloadExcel(list, response);
@@ -316,13 +421,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
mp.put("目的区域名称",detailDto.getRegionName2());
mp.put("子托号",detailDto.getSubTray());
mp.put("母拖号",detailDto.getMotherTray());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("供应商名称",detailDto.getSupplierName());
mp.put("入库时间",detailDto.getUpdateTime());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("来料批次号",detailDto.getIngotBatch());
mp.put("棒源等级",detailDto.getSiliconGrade());
mp.put("客户来料批次号",detailDto.getIngotBatch());
mp.put("已回温时间",detailDto.getUsedTime());
mp.put("每托数量(根)",detailDto.getNumber());
mp.put("入库时间",detailDto.getUpdateTime());
mp.put("已回温时间H",detailDto.getUsedTime());
list.add(mp);
}
FileUtil.downloadExcel(list, response);

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/WorkorderController.java
View File

@@ -2,11 +2,13 @@ package org.nl.wms.sch.workorder.controller;
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;
import org.nl.common.logging.annotation.Log;
import org.nl.wms.pdm.service.dao.PointDetailAdd;
import org.nl.wms.sch.report.service.dto.ReportQuery;
import org.nl.wms.sch.workorder.service.IWorkorderService;
import org.nl.wms.sch.workorder.service.dao.Workorder;
import org.nl.wms.sch.workorder.service.dto.WorkorderQuery;
@@ -16,6 +18,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.Set;
/**
@@ -38,7 +41,13 @@ public class WorkorderController {
public ResponseEntity<Object> query(WorkorderQuery whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(workorderService.queryAll(whereJson,page)),HttpStatus.OK);
}
@SneakyThrows
@GetMapping("/download")
@Log("导出")
@ApiOperation("导出")
public void queryDownload(WorkorderQuery whereJson, PageQuery page, HttpServletResponse response){
workorderService.queryDownload(whereJson,page,response);
}
@PostMapping
@Log("新增托盘出库工单")
@ApiOperation("新增托盘出库工单")

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/IWorkorderService.java
View File

@@ -4,9 +4,12 @@ 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.pdm.service.dao.PointDetailAdd;
import org.nl.wms.sch.report.service.dto.ReportQuery;
import org.nl.wms.sch.workorder.service.dao.Workorder;
import org.nl.wms.sch.workorder.service.dto.WorkorderQuery;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Set;
@@ -20,6 +23,8 @@ public interface IWorkorderService extends IService<Workorder> {
*/
IPage<Workorder> queryAll(WorkorderQuery whereJson, PageQuery pageable);
void queryDownload(WorkorderQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
/**
* 创建
* @param entity /

45
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java
View File

@@ -12,6 +12,7 @@ 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.ext.service.AcsToWmsService;
import org.nl.wms.ext.service.dto.to.BaseResponse;
import org.nl.wms.pda.service.PdaService;
@@ -19,6 +20,8 @@ import org.nl.wms.pda.service.dao.vo.PdaResponseVo;
import org.nl.wms.pdm.service.dao.PointDetailAdd;
import org.nl.wms.sch.point.service.ISchBasePointService;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
import org.nl.wms.sch.report.service.dto.HwDto;
import org.nl.wms.sch.report.service.dto.ReportQuery;
import org.nl.wms.sch.report.service.dto.YCLKCDto;
import org.nl.wms.sch.task.service.ISchBaseTaskService;
import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
@@ -33,10 +36,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@@ -75,6 +77,41 @@ public class WorkorderServiceImpl extends ServiceImpl<WorkorderMapper, Workorder
return pages;
}
@Override
public void queryDownload(WorkorderQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
IPage<Workorder> pages = this.queryAll(query,pageQuery);
List<Map<String, Object>> list = new ArrayList<>();
for(Workorder detailDto:pages.getRecords()){
Map<String, Object> mp = new LinkedHashMap<>();
mp.put("出库单号",detailDto.getSomtOrderNo());
mp.put("生产工单",detailDto.getMoname());
mp.put("托号",detailDto.getPalletSN());
mp.put("晶棒号",detailDto.getLotSN());
mp.put("物料编码",detailDto.getProductName());
mp.put("物料描述",detailDto.getProductDescription());
if("0".equals(detailDto.getStatus())){
mp.put("工单状态","未提交");
}else if("1".equals(detailDto.getStatus())){
mp.put("工单状态","已提交");
}else if("2".equals(detailDto.getStatus())){
mp.put("工单状态","出库中");
}else if("3".equals(detailDto.getStatus())){
mp.put("工单状态","已出库");
}else if("4".equals(detailDto.getStatus())){
mp.put("工单状态","已出库回传");
}
mp.put("物料名称",detailDto.getProductDescription());
mp.put("客户编码",detailDto.getSupplierCode());
mp.put("客户名称",detailDto.getSupplierName());
mp.put("入库时间",DateUtil.format(detailDto.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
list.add(mp);
}
FileUtil.downloadExcel(list, response);
}
@Override
public void create(Workorder entity) {
workorderMapper.insert(entity);

5
lms/nladmin-ui/src/views/wms/hw/movestor2/index.vue
View File

@@ -151,12 +151,11 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="pointCode" label="点位名称" :min-width="flexWidth('pointCode',crud.data,'点位名称')" />
<el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位名称')" />
<el-table-column prop="regionName" label="区域名称" :min-width="flexWidth('regionName',crud.data,'区域名称')" />
<el-table-column prop="subTray" label="子托编码" :min-width="flexWidth('subTray',crud.data,'子托编码')" />
<el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
<el-table-column prop="status" label="提交状态" :formatter="format_work_order_two_status" :min-width="flexWidth('status',crud.data,'工单状态')" />
<el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
<el-table-column prop="productDescription" label="物料名称" :min-width="flexWidth('productDescription',crud.data,'物料名称')" />
<el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'批次')" />
@@ -195,7 +194,7 @@ export default {
add: false,
edit: false,
del: false,
download: false,
download: true,
reset: false
},
query: {status:'0'}

8
lms/nladmin-ui/src/views/wms/pdm/workerordertwo/index.vue
View File

@@ -83,8 +83,8 @@
<el-table-column prop="productName" label="物料编码" :min-width="flexWidth('productName',crud.data,'物料编码')" />
<el-table-column prop="productDescription" label="物料描述" :min-width="flexWidth('productDescription',crud.data,'物料描述')" />
<el-table-column prop="status" label="工单状态" :formatter="format_work_order_two_status" :min-width="flexWidth('status',crud.data,'工单状态')" />
<el-table-column prop="supplierCode" label="客户编码" :min-width="flexWidth('supplierCode',crud.data,'客户编码')" />
<el-table-column prop="supplierName" label="客户名称" :min-width="flexWidth('supplierName',crud.data,'客户名称')" />
<el-table-column prop="supplierCode" label="棒源厂家编码" :min-width="flexWidth('supplierCode',crud.data,'棒源厂家编码')" />
<el-table-column prop="supplierName" label="棒源厂家名称" :min-width="flexWidth('supplierName',crud.data,'棒源厂家名称')" />
<el-table-column prop="createTime" label="创建日期" :min-width="150">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
@@ -111,7 +111,7 @@ export default {
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '晶棒工单管理',
title: '晶棒工单记录',
url: 'api/workorder',
idField: 'workorder_id',
sort: '',
@@ -119,7 +119,7 @@ export default {
add: false,
edit: false,
del: false,
download: false,
download: true,
reset: false
}
})

4
lms/nladmin-ui/src/views/wms/sch/data/index.vue
View File

@@ -27,8 +27,8 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column prop="supplierCode" label="客户编码" :min-width="flexWidth('supplierCode',crud.data,'客户编码')" />
<el-table-column prop="supplierName" label="客户名称" :min-width="flexWidth('supplierName',crud.data,'客户名称')" />
<el-table-column prop="supplierCode" label="棒源厂家编码" :min-width="flexWidth('supplierCode',crud.data,'棒源厂家编码')" />
<el-table-column prop="supplierName" label="棒源厂家名称" :min-width="flexWidth('supplierName',crud.data,'棒源厂家名称')" />
<el-table-column prop="productName" label="物料编码" :min-width="flexWidth('productName',crud.data,'物料编码')" />
<el-table-column prop="date" label="日期" :min-width="flexWidth('date',crud.data,'日期')" />
<el-table-column prop="specification" label="规格" :min-width="flexWidth('specification',crud.data,'规格')" />

33
lms/nladmin-ui/src/views/wms/sch/group/index.vue
View File

@@ -83,12 +83,6 @@
<el-form-item label="托盘编码">
<el-input v-model="form.vehicle_code" style="width: 240px;" />
</el-form-item>
<!--<el-form-item label="子托盘编码">
<el-input v-model="form.child_vehicle_code" style="width: 240px;" />
</el-form-item>-->
<!-- <el-form-item v-if="false" label="来源载具">
<el-input v-model="form.source_vehicle_code" style="width: 240px;" />
</el-form-item> -->
<el-form-item label="托盘类型">
<el-radio-group v-model="form.vehicle_type" style="width: 240px">
<el-radio label="1">子托盘</el-radio>
@@ -185,9 +179,6 @@
<el-form-item label="任务编码">
<el-input v-model="form.task_code" style="width: 240px;" />
</el-form-item>
<!--<el-form-item label="车间编码">
<el-input v-model="form.workshop_code" style="width: 240px;" />
</el-form-item>-->
<el-form-item label="组盘状态">
<el-select
v-model="form.group_status"
@@ -220,9 +211,6 @@
/>
</el-select>
</el-form-item>
<!--<el-form-item label="是否首个流程任务">
<el-input v-model="form.is_first_flow_task" style="width: 240px;" />
</el-form-item>-->
<el-form-item label="流程编码">
<el-input v-model="form.flow_code" style="width: 240px;" />
</el-form-item>
@@ -249,8 +237,6 @@
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="vehicle_code" label="托盘编码" :min-width="flexWidth('vehicle_code',crud.data,'托盘编码')" />
<!-- <el-table-column prop="child_vehicle_code" label="子托盘编码" :min-width="flexWidth('child_vehicle_code',crud.data,'子托盘编码')"/>-->
<!-- <el-table-column prop="source_vehicle_code" label="来源载具" :min-width="flexWidth('source_vehicle_code',crud.data,'来源载具')" /> -->
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
@@ -258,41 +244,22 @@
</el-table-column>
<el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
<!--<el-table-column prop="is_full" label="是否满托" :min-width="flexWidth('is_full',crud.data,'是否满托')">
<template slot-scope="scope">
{{ scope.row.is_full?'是':'否' }}
</template>
</el-table-column>-->
<el-table-column prop="material_id" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_id',crud.data,'物料编码')" />
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
<el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')" />
<el-table-column prop="instorage_time" label="回温开始时间" :min-width="flexWidth('instorage_time',crud.data,'入库时间')" />
<el-table-column prop="group_bind_material_status" label="绑定状态" :min-width="flexWidth('group_bind_material_status',crud.data,'回温开始时间')">
<template slot-scope="scope">
{{ dict.label.group_bind_material_status[scope.row.group_bind_material_status] }}
</template>
</el-table-column>
<el-table-column prop="standing_time" label="回温时间(小时)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
<!-- <el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" /> -->
<el-table-column prop="material_weight" label="物料重量" :min-width="flexWidth('material_weight',crud.data,'物料重量')" />
<el-table-column prop="group_number" label="组盘次数" :min-width="flexWidth('group_number',crud.data,'组盘次数')" />
<el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
<!-- <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')"/>-->
<el-table-column prop="group_status" label="组盘状态" :min-width="flexWidth('group_status',crud.data,'组盘状态')">
<template slot-scope="scope">
{{ dict.label.group_status[scope.row.group_status] }}
</template>
</el-table-column>
<!-- <el-table-column prop="is_first_flow_task" label="是否首个流程任务" :min-width="flexWidth('is_first_flow_task',crud.data,'是否首个流程任务')"/>-->
<!-- <el-table-column prop="flow_code" label="流程编码" :min-width="flexWidth('flow_code',crud.data,'流程编码')"/>-->
<!-- <el-table-column prop="flow_num" label="流程顺序" :min-width="flexWidth('flow_num',crud.data,'流程顺序')"/>-->
<el-table-column prop="move_way" label="移动途径" :min-width="flexWidth('move_way',crud.data,'移动途径')" />
<el-table-column prop="before_task_code" label="上一任务" :min-width="flexWidth('before_task_code',crud.data,'上一任务')" />
<el-table-column prop="next_task_code" label="下一任务" :min-width="flexWidth('next_task_code',crud.data,'上一任务')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />

4
lms/nladmin-ui/src/views/wms/sch/material/index.vue
View File

@@ -143,7 +143,7 @@ export default {
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '原材料入库管理',
title: '原材料入库记录',
url: 'api/material',
idField: 'group_id',
sort: '',
@@ -151,7 +151,7 @@ export default {
add: false,
edit: false,
del: false,
download: false,
download: true,
reset: false
},
query: {

4
lms/nladmin-ui/src/views/wms/sch/report/index.vue
View File

@@ -110,7 +110,7 @@
<el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
<el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
<el-table-column prop="productDescription" label="物料名称" :min-width="flexWidth('productDescription',crud.data,'物料名称')" />
<el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'客户来料批次号')" />
<el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'来料批次号')" />
</el-table>
<!--分页组件-->
<pagination />
@@ -142,7 +142,7 @@ export default {
add: false,
edit: false,
del: false,
download: false,
download: true,
reset: false
},
query: {

4
lms/nladmin-ui/src/views/wms/ycl/detail/index.vue
View File

@@ -36,12 +36,12 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="供应商名称">
<el-form-item label="棒源厂家">
<el-select
v-model="query.supplierName"
clearable
size="mini"
placeholder="供应商名称"
placeholder="棒源厂家"
class="filter-item"
filterable
@remote-method="getNowSupplierNameList"

6
lms/nladmin-ui/src/views/wms/ycl/in/index.vue
View File

@@ -102,9 +102,9 @@
<el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
<el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
<el-table-column prop="productDescription" label="物料名称" :min-width="flexWidth('productDescription',crud.data,'物料名称')" />
<el-table-column prop="productName" label="物料名称" :min-width="flexWidth('productName',crud.data,'物料名称')" />
<el-table-column prop="productName" label="物料编码" :min-width="flexWidth('productName',crud.data,'物料编码')" />
<el-table-column prop="lotSN" label="晶体编号" :min-width="flexWidth('lotSN',crud.data,'晶体编号')" />
<el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'客户来料批次号')" />
<el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'来料批次号')" />
<el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
<el-table-column prop="updateTime" label="入库时间" :min-width="flexWidth('updateTime',crud.data,'入库时间')" />
<el-table-column prop="incomingWeight" label="重量KG" :min-width="flexWidth('incomingWeight',crud.data,'重量KG')" />
@@ -138,7 +138,7 @@ export default {
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '晶棒库库存明细',
title: '晶棒库入库明细',
url: 'api/report/yl/in',
idField: 'group_id',
sort: 'pointCode,desc',

6
lms/nladmin-ui/src/views/wms/ycl/out/index.vue
View File

@@ -102,9 +102,9 @@
<el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
<el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
<el-table-column prop="productDescription" label="物料名称" :min-width="flexWidth('productDescription',crud.data,'物料名称')" />
<el-table-column prop="productName" label="物料名称" :min-width="flexWidth('productName',crud.data,'物料名称')" />
<el-table-column prop="productName" label="物料编码" :min-width="flexWidth('productName',crud.data,'物料编码')" />
<el-table-column prop="lotSN" label="晶体编号" :min-width="flexWidth('lotSN',crud.data,'晶体编号')" />
<el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'客户来料批次号')" />
<el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'来料批次号')" />
<el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
<el-table-column prop="updateTime" label="出库时间" :min-width="flexWidth('updateTime',crud.data,'出库时间')" />
<el-table-column prop="incomingWeight" label="重量KG" :min-width="flexWidth('incomingWeight',crud.data,'重量KG')" />
@@ -138,7 +138,7 @@ export default {
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '晶棒库库存明细',
title: '晶棒库出库明细',
url: 'api/report/yl/out',
idField: 'group_id',
sort: '',

4
lms/nladmin-ui/src/views/wms/ycl/outdetail/index.vue
View File

@@ -182,7 +182,7 @@ export default {
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '晶棒库出库库存明细',
title: '晶棒库工单出库',
url: 'api/report/yl/outdetail',
idField: 'pointCode',
sort: 'pointCode,desc',
@@ -190,7 +190,7 @@ export default {
add: false,
edit: false,
del: false,
download: false,
download: true,
reset: false
},
query: {