opt:晶棒库报表和回温库报表查询逻辑优化、页面优化
This commit is contained in:
@@ -21,20 +21,56 @@ public interface IReportService extends IService<ReportDto> {
|
||||
*/
|
||||
IPage<ReportDto> queryAll(ReportQuery whereJson, PageQuery pageable);
|
||||
|
||||
/**
|
||||
* 回温间库存明细
|
||||
* @param whereJson
|
||||
* @param pageable
|
||||
* @return
|
||||
*/
|
||||
IPage<HwDto> queryHwDetail(ReportQuery whereJson, PageQuery pageable);
|
||||
|
||||
/**
|
||||
* 回温间入库明细------------------------
|
||||
* @param whereJson
|
||||
* @param pageable
|
||||
* @return
|
||||
*/
|
||||
IPage<HwDto> queryHwIn(ReportQuery whereJson, PageQuery pageable);
|
||||
|
||||
/**
|
||||
* 回温间待入库明细---------------
|
||||
* @param whereJson
|
||||
* @param pageable
|
||||
* @return
|
||||
*/
|
||||
IPage<HwDto> queryHwInPending(ReportQuery whereJson, PageQuery pageable);
|
||||
|
||||
/**
|
||||
* 回温间出库明细------------------
|
||||
* @param whereJson
|
||||
* @param pageable
|
||||
* @return
|
||||
*/
|
||||
IPage<HwDto> queryHwOut(ReportQuery whereJson, PageQuery pageable);
|
||||
|
||||
/**
|
||||
* 回温间待出库存明细------------
|
||||
* @param whereJson
|
||||
* @param pageable
|
||||
* @return
|
||||
*/
|
||||
IPage<HwDto> queryHwOutPending(ReportQuery whereJson, PageQuery pageable);
|
||||
|
||||
/**
|
||||
* 原料库库存明细-------
|
||||
* @param whereJson
|
||||
* @param pageable
|
||||
* @return
|
||||
*/
|
||||
IPage<YlDto> queryYlDetail(ReportQuery whereJson, PageQuery pageable);
|
||||
|
||||
/**
|
||||
* 查询工单库存
|
||||
* 原料库工单库存明细------
|
||||
* @param whereJson
|
||||
* @param pageable
|
||||
* @return
|
||||
@@ -42,15 +78,27 @@ public interface IReportService extends IService<ReportDto> {
|
||||
IPage<YCLKCDto> queryYlOutDetail(ReportQuery whereJson, PageQuery pageable);
|
||||
|
||||
/**
|
||||
* 查询原料缓存区库存
|
||||
* 查询原料缓存区库存-----
|
||||
* @param whereJson
|
||||
* @param pageable
|
||||
* @return
|
||||
*/
|
||||
IPage<YCLKCDto> queryMoveDetail(ReportQuery whereJson, PageQuery pageable);
|
||||
|
||||
/**
|
||||
* 原材入库明细--------
|
||||
* @param whereJson
|
||||
* @param pageable
|
||||
* @return
|
||||
*/
|
||||
IPage<YlDto> queryYlIn(ReportQuery whereJson, PageQuery pageable);
|
||||
|
||||
/**
|
||||
* 原料库出库明细--------
|
||||
* @param whereJson
|
||||
* @param pageable
|
||||
* @return
|
||||
*/
|
||||
IPage<YlDto> queryYlOut(ReportQuery whereJson, PageQuery pageable);
|
||||
|
||||
void queryYlDetailDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
|
||||
|
||||
@@ -53,8 +53,8 @@
|
||||
sch_base_point p,sch_base_material m
|
||||
WHERE
|
||||
p.vehicle_code2 = m.PalletSN
|
||||
and
|
||||
vehicle_code2!='' AND vehicle_code2 is not null
|
||||
AND vehicle_code2!=''
|
||||
AND vehicle_code2 is not null
|
||||
<if test="query.supplierName != null">
|
||||
and m.supplierName like CONCAT('%', #{query.supplierName}, '%')
|
||||
</if>
|
||||
@@ -183,24 +183,22 @@
|
||||
<select id="queryYlIn" resultType="org.nl.wms.sch.report.service.dto.YlDto">
|
||||
SELECT
|
||||
m.lotSN,
|
||||
p.point_code as pointCode,
|
||||
p.point_name as pointName,
|
||||
p.region_code as regionCode,
|
||||
p.region_name as regionName,
|
||||
p.vehicle_code2 as subTray,
|
||||
p.vehicle_code as motherTray,
|
||||
t.update_time as updateTime,
|
||||
p.point_code AS pointCode,
|
||||
p.point_name AS pointName,
|
||||
p.region_code AS regionCode,
|
||||
p.region_name AS regionName,
|
||||
t.vehicle_code2 AS subTray,
|
||||
t.vehicle_code AS motherTray,
|
||||
t.update_time AS updateTime,
|
||||
m.*
|
||||
FROM
|
||||
sch_base_task t,sch_base_point p,sch_base_material m
|
||||
sch_base_task t,
|
||||
sch_base_point p,
|
||||
sch_base_material m
|
||||
WHERE
|
||||
p.vehicle_code2 = m.PalletSN
|
||||
and
|
||||
t.point_code2 like 'HJ%'
|
||||
and
|
||||
t.point_code2=p.point_code
|
||||
and
|
||||
p.vehicle_code2!='' AND p.vehicle_code2 is not null
|
||||
t.vehicle_code2 = m.PalletSN
|
||||
AND t.point_code2 = p.point_code
|
||||
AND t.point_code2 LIKE 'HJ%'
|
||||
<if test="query.supplierName != null">
|
||||
and m.supplierName like CONCAT('%', #{query.supplierName}, '%')
|
||||
</if>
|
||||
@@ -225,24 +223,24 @@
|
||||
<select id="queryYlOut" resultType="org.nl.wms.sch.report.service.dto.YlDto">
|
||||
SELECT
|
||||
m.lotSN,
|
||||
p.point_code as pointCode,
|
||||
p.point_name as pointName,
|
||||
p.region_code as regionCode,
|
||||
p.region_name as regionName,
|
||||
p.vehicle_code2 as subTray,
|
||||
p.vehicle_code as motherTray,
|
||||
t.update_time as updateTime,
|
||||
p.point_code AS pointCode,
|
||||
p.region_name AS regionName,
|
||||
p2.point_code AS pointCode2,
|
||||
p2.region_name AS regionName2,
|
||||
t.vehicle_code2 AS subTray,
|
||||
t.vehicle_code AS motherTray,
|
||||
t.update_time AS updateTime,
|
||||
m.*
|
||||
FROM
|
||||
sch_base_task t,sch_base_point p,sch_base_material m
|
||||
sch_base_task t,
|
||||
sch_base_point p,
|
||||
sch_base_point p2,
|
||||
sch_base_material m
|
||||
WHERE
|
||||
p.vehicle_code2 = m.PalletSN
|
||||
and
|
||||
t.point_code2 like 'XHW%'
|
||||
and
|
||||
t.point_code2=p.point_code
|
||||
and
|
||||
p.vehicle_code2!='' AND p.vehicle_code2 is not null
|
||||
t.vehicle_code2 = m.PalletSN
|
||||
AND t.point_code1 = p.point_code
|
||||
AND t.point_code2 = p2.point_code
|
||||
AND t.point_code2 LIKE 'XHW%'
|
||||
<if test="query.supplierName != null">
|
||||
and m.supplierName like CONCAT('%', #{query.supplierName}, '%')
|
||||
</if>
|
||||
@@ -261,7 +259,7 @@
|
||||
<if test="query.ingotBatch != null">
|
||||
and m.ingotBatch like CONCAT('%', #{query.ingotBatch}, '%')
|
||||
</if>
|
||||
ORDER BY t.update_time DESC,point_code ASC
|
||||
ORDER BY t.update_time DESC
|
||||
</select>
|
||||
|
||||
<select id="queryHwDetail" resultType="org.nl.wms.sch.report.service.dto.HwDto">
|
||||
@@ -274,19 +272,19 @@
|
||||
p.vehicle_code AS motherTray,
|
||||
p.update_time AS updateTime,
|
||||
p.ing_task_code AS ing_task_code,
|
||||
ANY_VALUE ( v.standing_time ) AS standingTime,
|
||||
ANY_VALUE ( m2.siliconGrade ) AS siliconGrade,
|
||||
ANY_VALUE ( m2.productDescription ) AS productDescription,
|
||||
ANY_VALUE ( m2.supplierName ) AS supplierName,
|
||||
ANY_VALUE ( m2.ingotBatch ) AS ingotBatch,
|
||||
ANY_VALUE ( m2.number ) AS number,
|
||||
v.standing_time AS standingTime,
|
||||
m2.siliconGrade AS siliconGrade,
|
||||
m2.productDescription AS productDescription,
|
||||
m2.supplierName AS supplierName,
|
||||
m2.ingotBatch AS ingotBatch,
|
||||
m2.number AS number,
|
||||
TIMESTAMPDIFF(
|
||||
HOUR,
|
||||
p.update_time,
|
||||
curtime()) AS usedTime
|
||||
FROM
|
||||
sch_base_point p
|
||||
LEFT JOIN sch_base_vehiclematerialgroup v ON p.point_code = v.point_code
|
||||
LEFT JOIN sch_base_vehiclematerialgroup v ON p.vehicle_code2 = v.vehicle_code
|
||||
LEFT JOIN (
|
||||
SELECT
|
||||
m.PalletSN AS PalletSN,
|
||||
@@ -332,8 +330,6 @@
|
||||
<if test="query.number != null">
|
||||
and m2.number = #{query.number}
|
||||
</if>
|
||||
GROUP BY
|
||||
pointCode
|
||||
ORDER BY pointCode ASC
|
||||
</select>
|
||||
|
||||
@@ -341,14 +337,14 @@
|
||||
SELECT
|
||||
p.point_code AS pointCode,
|
||||
p.region_name AS regionName,
|
||||
p.vehicle_code2 AS subTray,
|
||||
p.vehicle_code AS motherTray,
|
||||
p.update_time AS updateTime,
|
||||
ANY_VALUE ( m2.siliconGrade ) AS siliconGrade,
|
||||
ANY_VALUE ( m2.productDescription ) AS productDescription,
|
||||
ANY_VALUE ( m2.supplierName ) AS supplierName,
|
||||
ANY_VALUE ( m2.ingotBatch ) AS ingotBatch,
|
||||
ANY_VALUE ( m2.number ) AS number,
|
||||
t.vehicle_code2 AS subTray,
|
||||
t.vehicle_code AS motherTray,
|
||||
t.update_time AS updateTime,
|
||||
m2.siliconGrade AS siliconGrade,
|
||||
m2.productDescription AS productDescription,
|
||||
m2.supplierName AS supplierName,
|
||||
m2.ingotBatch AS ingotBatch,
|
||||
m2.number AS number,
|
||||
TIMESTAMPDIFF(
|
||||
HOUR,
|
||||
p.update_time,
|
||||
@@ -379,8 +375,8 @@
|
||||
m.ingotBatch
|
||||
) m2 ON t.vehicle_code2 = m2.PalletSN
|
||||
WHERE
|
||||
p.vehicle_code2 != ''
|
||||
AND p.vehicle_code2 IS NOT NULL
|
||||
t.vehicle_code2 != ''
|
||||
AND t.vehicle_code2 IS NOT NULL
|
||||
AND t.point_code2 LIKE 'XHW%'
|
||||
AND t.task_status in ('5')
|
||||
<if test="query.supplierName != null">
|
||||
@@ -401,9 +397,7 @@
|
||||
<if test="query.number != null">
|
||||
and m2.number = #{query.number}
|
||||
</if>
|
||||
GROUP BY
|
||||
pointCode
|
||||
ORDER BY p.update_time DESC, pointCode ASC
|
||||
ORDER BY t.update_time DESC
|
||||
</select>
|
||||
|
||||
<select id="queryHwInPending" resultType="org.nl.wms.sch.report.service.dto.HwDto">
|
||||
@@ -475,17 +469,17 @@
|
||||
SELECT
|
||||
p.point_code AS pointCode,
|
||||
p.region_name AS regionName,
|
||||
ANY_VALUE ( p2.point_code ) AS pointCode2,
|
||||
ANY_VALUE ( p2.region_name ) AS regionName2,
|
||||
ANY_VALUE ( t.vehicle_code2 ) AS subTray,
|
||||
ANY_VALUE ( t.vehicle_code ) AS motherTray,
|
||||
p.update_time AS updateTime,
|
||||
ANY_VALUE ( v.standing_time ) AS standingTime,
|
||||
ANY_VALUE ( m2.siliconGrade ) AS siliconGrade,
|
||||
ANY_VALUE ( m2.productDescription ) AS productDescription,
|
||||
ANY_VALUE ( m2.supplierName ) AS supplierName,
|
||||
ANY_VALUE ( m2.ingotBatch ) AS ingotBatch,
|
||||
ANY_VALUE ( m2.number ) AS number,
|
||||
p2.point_code AS pointCode2,
|
||||
p2.region_name AS regionName2,
|
||||
t.vehicle_code2 AS subTray,
|
||||
t.vehicle_code AS motherTray,
|
||||
t.update_time AS updateTime,
|
||||
v.standing_time AS standingTime,
|
||||
m2.siliconGrade AS siliconGrade,
|
||||
m2.productDescription AS productDescription,
|
||||
m2.supplierName AS supplierName,
|
||||
m2.ingotBatch AS ingotBatch,
|
||||
m2.number AS number,
|
||||
TIMESTAMPDIFF(
|
||||
HOUR,
|
||||
p.update_time,
|
||||
@@ -518,8 +512,8 @@
|
||||
m.ingotBatch
|
||||
) m2 ON t.vehicle_code2 = m2.PalletSN
|
||||
WHERE
|
||||
p.vehicle_code2 != ''
|
||||
AND p.vehicle_code2 IS NOT NULL
|
||||
t.vehicle_code2 != ''
|
||||
AND t.vehicle_code2 IS NOT NULL
|
||||
AND t.is_delete = '0'
|
||||
AND t.point_code1 LIKE 'XHW%'
|
||||
AND t.point_code2 LIKE 'FHW%'
|
||||
@@ -541,9 +535,7 @@
|
||||
<if test="query.number != null">
|
||||
and m2.number = #{query.number}
|
||||
</if>
|
||||
GROUP BY
|
||||
pointCode
|
||||
ORDER BY p.update_time DESC, pointCode ASC
|
||||
ORDER BY t.update_time DESC
|
||||
</select>
|
||||
|
||||
<select id="queryHwOutPending" resultType="org.nl.wms.sch.report.service.dto.HwDto">
|
||||
@@ -552,8 +544,8 @@
|
||||
p.region_name AS regionName,
|
||||
ANY_VALUE ( p2.point_code ) AS pointCode2,
|
||||
ANY_VALUE ( p2.region_name ) AS regionName2,
|
||||
ANY_VALUE ( t.vehicle_code2 ) AS subTray,
|
||||
ANY_VALUE ( t.vehicle_code ) AS motherTray,
|
||||
ANY_VALUE ( p.vehicle_code2 ) AS subTray,
|
||||
ANY_VALUE ( p.vehicle_code ) AS motherTray,
|
||||
p.update_time AS updateTime,
|
||||
ANY_VALUE ( m2.siliconGrade ) AS siliconGrade,
|
||||
ANY_VALUE ( m2.productDescription ) AS productDescription,
|
||||
|
||||
@@ -23,6 +23,14 @@ public class YlDto implements Serializable {
|
||||
* 区域名称
|
||||
*/
|
||||
private String regionName;
|
||||
/**
|
||||
* 目的点位编码
|
||||
*/
|
||||
private String pointCode2;
|
||||
/**
|
||||
* 目的区域名称
|
||||
*/
|
||||
private String regionName2;
|
||||
/**
|
||||
* 子托号
|
||||
*/
|
||||
|
||||
@@ -177,14 +177,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
|
||||
for(YlDto 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.getPointCode2());
|
||||
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.getUpdateTime());
|
||||
mp.put("棒源等级",detailDto.getSiliconGrade());
|
||||
mp.put("客户来料批次号",detailDto.getIngotBatch());
|
||||
mp.put("晶棒号",detailDto.getLotSN());
|
||||
@@ -279,7 +279,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
|
||||
mp.put("母拖号",detailDto.getMotherTray());
|
||||
mp.put("物料名称",detailDto.getProductDescription());
|
||||
mp.put("供应商名称",detailDto.getSupplierName());
|
||||
mp.put("入库时间",detailDto.getUpdateTime());
|
||||
mp.put("出库时间",detailDto.getUpdateTime());
|
||||
mp.put("棒源等级",detailDto.getSiliconGrade());
|
||||
mp.put("客户来料批次号",detailDto.getIngotBatch());
|
||||
mp.put("回温时间",detailDto.getStandingTime());
|
||||
|
||||
@@ -196,7 +196,7 @@ export default {
|
||||
title: '回温间库存明细',
|
||||
url: 'api/report/hw/detail',
|
||||
idField: 'group_id',
|
||||
sort: 'pointCode,desc',
|
||||
sort: '',
|
||||
optShow: {
|
||||
add: false,
|
||||
edit: false,
|
||||
|
||||
@@ -141,10 +141,10 @@ export default {
|
||||
mixins: [presenter(), header(), crud()],
|
||||
cruds() {
|
||||
return CRUD({
|
||||
title: '回温间库存明细',
|
||||
title: '回温间入库明细',
|
||||
url: 'api/report/hw/in',
|
||||
idField: 'group_id',
|
||||
sort: 'pointCode,desc',
|
||||
sort: '',
|
||||
optShow: {
|
||||
add: false,
|
||||
edit: false,
|
||||
|
||||
@@ -117,7 +117,7 @@
|
||||
<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="number" label="每托数量(根)" :min-width="flexWidth('number',crud.data,'每托数量(根)')" />
|
||||
<el-table-column prop="updateTime" label="更新时间" :min-width="150" />
|
||||
<el-table-column prop="updateTime" label="更新时间" :min-width="flexWidth('updateTime',crud.data,'更新时间')" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
|
||||
@@ -118,10 +118,10 @@
|
||||
<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="number" label="每托数量(根)" :min-width="flexWidth('number',crud.data,'每托数量(根)')" />
|
||||
<el-table-column prop="updateTime" label="入库时间" :min-width="170" />
|
||||
<el-table-column prop="standingTime" label="回温时间H" :min-width="70" />
|
||||
<el-table-column prop="usedTime" label="已回温时间H" :min-width="70" />
|
||||
<el-table-column label="是否完成" :min-width="70">
|
||||
<el-table-column prop="updateTime" label="出库时间" :min-width="flexWidth('updateTime',crud.data,'出库时间')" />
|
||||
<el-table-column prop="standingTime" label="回温时间H" :min-width="flexWidth('standingTime',crud.data,'回温时间H')" />
|
||||
<el-table-column prop="usedTime" label="已回温时间H" :min-width="flexWidth('usedTime',crud.data,'已回温时间H')" />
|
||||
<el-table-column label="是否完成" :min-width="80">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.standingTime > scope.row.usedTime ? '未完成' : '已完成' }}</span>
|
||||
</template>
|
||||
@@ -149,10 +149,10 @@ export default {
|
||||
mixins: [presenter(), header(), crud()],
|
||||
cruds() {
|
||||
return CRUD({
|
||||
title: '回温间库存明细',
|
||||
title: '回温间出库明细',
|
||||
url: 'api/report/hw/out',
|
||||
idField: 'group_id',
|
||||
sort: 'pointCode,desc',
|
||||
sort: '',
|
||||
optShow: {
|
||||
add: false,
|
||||
edit: false,
|
||||
|
||||
@@ -119,8 +119,8 @@
|
||||
<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="number" label="每托数量(根)" :min-width="flexWidth('number',crud.data,'每托数量(根)')" />
|
||||
<el-table-column prop="updateTime" label="入库时间" :min-width="170" />
|
||||
<el-table-column prop="usedTime" label="已回温时间H" :min-width="70" />
|
||||
<el-table-column prop="updateTime" label="入库时间" :min-width="flexWidth('updateTime',crud.data,'入库时间')" />
|
||||
<el-table-column prop="usedTime" label="已回温时间H" :min-width="flexWidth('usedTime',crud.data,'已回温时间H')" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
|
||||
@@ -106,8 +106,8 @@
|
||||
<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="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
|
||||
<el-table-column prop="updateTime" label="入库时间" :min-width="140" />
|
||||
<el-table-column prop="incomingWeight" label="重量KG" :min-width="70" />
|
||||
<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')" />
|
||||
<el-table-column prop="weightCoefficientValue" label="折算系数" :min-width="flexWidth('weightCoefficientValue',crud.data,'折算系数')" />
|
||||
<el-table-column prop="incomingLength" label="来料长度mm" :min-width="flexWidth('incomingLength',crud.data,'来料长度mm')" />
|
||||
<el-table-column prop="incomingchipping" label="来料缺陷长度mm" :min-width="flexWidth('incomingchipping',crud.data,'来料缺陷长度mm')" />
|
||||
|
||||
@@ -106,8 +106,8 @@
|
||||
<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="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
|
||||
<el-table-column prop="updateTime" label="入库时间" :min-width="140" />
|
||||
<el-table-column prop="incomingWeight" label="重量KG" :min-width="70" />
|
||||
<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')" />
|
||||
<el-table-column prop="weightCoefficientValue" label="折算系数" :min-width="flexWidth('weightCoefficientValue',crud.data,'折算系数')" />
|
||||
<el-table-column prop="incomingLength" label="来料长度mm" :min-width="flexWidth('incomingLength',crud.data,'来料长度mm')" />
|
||||
<el-table-column prop="incomingchipping" label="来料缺陷长度mm" :min-width="flexWidth('incomingchipping',crud.data,'来料缺陷长度mm')" />
|
||||
|
||||
@@ -95,9 +95,9 @@
|
||||
<!--表格渲染-->
|
||||
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" height="550" @selection-change="crud.selectionChangeHandler">
|
||||
<el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" />
|
||||
<el-table-column prop="pointName" label="点位名称" :min-width="flexWidth('pointName',crud.data,'点位名称')" />
|
||||
<el-table-column prop="regionCode" label="区域编码" :min-width="flexWidth('regionCode',crud.data,'区域编码')" />
|
||||
<el-table-column prop="regionName" label="区域名称" :min-width="flexWidth('regionName',crud.data,'区域名称')" />
|
||||
<el-table-column prop="pointCode2" label="目的点位编码" :min-width="flexWidth('pointCode2',crud.data,'目的点位编码')" />
|
||||
<el-table-column prop="regionName2" label="目的区域名称" :min-width="flexWidth('regionName2',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="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
|
||||
@@ -106,8 +106,8 @@
|
||||
<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="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
|
||||
<el-table-column prop="updateTime" label="入库时间" :min-width="140" />
|
||||
<el-table-column prop="incomingWeight" label="重量KG" :min-width="70" />
|
||||
<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')" />
|
||||
<el-table-column prop="weightCoefficientValue" label="折算系数" :min-width="flexWidth('weightCoefficientValue',crud.data,'折算系数')" />
|
||||
<el-table-column prop="incomingLength" label="来料长度mm" :min-width="flexWidth('incomingLength',crud.data,'来料长度mm')" />
|
||||
<el-table-column prop="incomingchipping" label="来料缺陷长度mm" :min-width="flexWidth('incomingchipping',crud.data,'来料缺陷长度mm')" />
|
||||
@@ -141,7 +141,7 @@ export default {
|
||||
title: '晶棒库库存明细',
|
||||
url: 'api/report/yl/out',
|
||||
idField: 'group_id',
|
||||
sort: 'pointCode,desc',
|
||||
sort: '',
|
||||
optShow: {
|
||||
add: false,
|
||||
edit: false,
|
||||
|
||||
@@ -151,7 +151,6 @@
|
||||
<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="somtOrderNo" label="出库单号" :min-width="flexWidth('somtOrderNo',crud.data,'出库单号')" />-->
|
||||
<el-table-column prop="moname" label="生产工单" :min-width="flexWidth('moname',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,'供应商名称')" />
|
||||
|
||||
Reference in New Issue
Block a user