From 54cf09546d6a9c9510ea5ab5aa58db2e063b4965 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 3 Aug 2023 17:09:53 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E7=AA=91=E5=86=85=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/controller/ReportController.java | 6 ++ .../nl/wms/report/service/ReportService.java | 2 + .../service/dao/mapper/ReportMapper.java | 2 + .../service/dao/mapper/ReportMapper.xml | 16 ++++- .../service/impl/ReportServiceImpl.java | 7 ++ .../src/views/system/dept/index.vue | 2 +- .../src/views/wms/basedata/brick/index.vue | 12 +++- .../src/views/wms/das/inKiln/index.vue | 72 +++++++++++++++++++ .../src/views/wms/das/intoKiln/index.vue | 1 + 9 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 lms/nladmin-ui/src/views/wms/das/inKiln/index.vue diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java index cc05648..4c0b040 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java @@ -60,4 +60,10 @@ public class ReportController { public ResponseEntity<Object> outKilnReport(Map json, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(reportService.outKilnReport(json,page)), HttpStatus.OK); } + @GetMapping("/inKilnReport") + @Log("窑内物料实时报表") + @ApiOperation("窑内物料实时报表") + public ResponseEntity<Object> inKilnReport(Map json, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(reportService.inKilnReport(json,page)), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java index 831cd0c..5db53d7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java @@ -16,5 +16,7 @@ public interface ReportService { IPage<IOKilnReportVo> outKilnReport(Map json, PageQuery page); + IPage<IOKilnReportVo> inKilnReport(Map json, PageQuery page); + // IPage<> mudTransfer(JSONObject json, PageQuery page); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java index fdd4957..8293d29 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java @@ -13,4 +13,6 @@ public interface ReportMapper { IPage<IOKilnReportVo> intoKilnReportByPage(IPage<IOKilnReportVo> pages, JSONObject query); IPage<IOKilnReportVo> outKilnReportByPage(IPage<IOKilnReportVo> pages, JSONObject object); + + IPage<IOKilnReportVo> inKilnReport(IPage<IOKilnReportVo> pages, JSONObject object); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml index 3abe23e..b50e4c8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml @@ -4,6 +4,7 @@ <select id="intoKilnReportByPage" resultType="org.nl.wms.report.service.dao.vo.IOKilnReportVo"> SELECT vg.into_kiln_time, + vg.out_kiln_time, vg.vehicle_code, vg.pcsn, vg.material_qty, @@ -12,7 +13,7 @@ FROM `sch_base_vehiclematerialgroup` vg LEFT JOIN md_base_material m ON m.material_id = vg.material_id - WHERE vg.into_kiln_time IS NOT NULL AND vg.out_kiln_time IS NULL + WHERE vg.into_kiln_time IS NOT NULL </select> <select id="outKilnReportByPage" resultType="org.nl.wms.report.service.dao.vo.IOKilnReportVo"> SELECT @@ -28,4 +29,17 @@ LEFT JOIN md_base_material m ON m.material_id = vg.material_id WHERE vg.into_kiln_time IS NOT NULL AND vg.out_kiln_time IS NOT NULL </select> + <select id="inKilnReport" resultType="org.nl.wms.report.service.dao.vo.IOKilnReportVo"> + SELECT + vg.into_kiln_time, + vg.vehicle_code, + vg.pcsn, + vg.material_qty, + m.material_code, + m.material_name + FROM + `sch_base_vehiclematerialgroup` vg + LEFT JOIN md_base_material m ON m.material_id = vg.material_id + WHERE vg.into_kiln_time IS NOT NULL AND vg.out_kiln_time IS NULL + </select> </mapper> diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java index e4b1206..3944171 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java @@ -36,4 +36,11 @@ public class ReportServiceImpl implements ReportService { pages = reportMapper.outKilnReportByPage(pages, new JSONObject(query)); return pages; } + + @Override + public IPage<IOKilnReportVo> inKilnReport(Map query, PageQuery page) { + IPage<IOKilnReportVo> pages = new Page<>(page.getPage() + 1, page.getSize()); + pages = reportMapper.inKilnReport(pages, new JSONObject(query)); + return pages; + } } diff --git a/lms/nladmin-ui/src/views/system/dept/index.vue b/lms/nladmin-ui/src/views/system/dept/index.vue index 633a7a9..9adecfa 100644 --- a/lms/nladmin-ui/src/views/system/dept/index.vue +++ b/lms/nladmin-ui/src/views/system/dept/index.vue @@ -38,7 +38,7 @@ > <el-form ref="form" inline :model="form" :rules="rules" size="mini" label-width="80px"> <el-form-item label="部门编码" prop="code"> - <el-input v-model="form.code" :disabled="true" style="width: 370px;" /> + <el-input v-model="form.code" :disabled="crud.status.edit" style="width: 370px;" /> </el-form-item> <el-form-item label="部门名称" prop="name"> <el-input v-model="form.name" style="width: 370px;" /> diff --git a/lms/nladmin-ui/src/views/wms/basedata/brick/index.vue b/lms/nladmin-ui/src/views/wms/basedata/brick/index.vue index c50340c..8130907 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/brick/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/brick/index.vue @@ -94,7 +94,11 @@ prop="is_qualified" label="是否合格" :min-width="flexWidth('is_qualified',crud.data,'是否合格')" - /> + > + <template slot-scope="scope"> + {{ scope.row.is_qualified ? '合格' : '不合格'}} + </template> + </el-table-column> <el-table-column prop="laser_marking_code" label="激光标刻码" @@ -120,7 +124,11 @@ :min-width="flexWidth('unqualified_qty',crud.data,'缺陷个数')" /> <el-table-column prop="group_id" label="组盘标识" :min-width="flexWidth('group_id',crud.data,'组盘标识')" /> - <el-table-column prop="is_group" label="是否组盘" :min-width="flexWidth('is_group',crud.data,'是否组盘')" /> + <el-table-column prop="is_group" label="是否组盘" :min-width="flexWidth('is_group',crud.data,'是否组盘')" > + <template slot-scope="scope"> + {{ scope.row.is_group ? '已组盘' : '未组盘'}} + </template> + </el-table-column> <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right"> <template slot-scope="scope"> <udOperation diff --git a/lms/nladmin-ui/src/views/wms/das/inKiln/index.vue b/lms/nladmin-ui/src/views/wms/das/inKiln/index.vue new file mode 100644 index 0000000..7157856 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/das/inKiln/index.vue @@ -0,0 +1,72 @@ +<template> + <div class="app-container"> + <!--工具栏--> + <div class="head-container"> + <!--如果想在工具栏加入更多按钮,可以使用插槽方式, slot = 'left' or 'right'--> + <crudOperation :permission="permission" /> + <!--表格渲染--> + <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="into_kiln_time" label="入窑时间" :min-width="flexWidth('into_kiln_time',crud.data,'入窑时间')" /> + <el-table-column prop="vehicle_code" label="托盘号" :min-width="flexWidth('vehicle_code',crud.data,'托盘号')" /> + <el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'数量')" /> + <el-table-column prop="material_code" label="产品编码" :min-width="flexWidth('material_code',crud.data,'拆垛工位')" /> + <el-table-column prop="material_name" label="产品名称" :min-width="flexWidth('material_name',crud.data,'分拣工单')" /> + <el-table-column prop="material_qty" label="产品数量" :min-width="flexWidth('material_qty',crud.data,'分拣工单')" /> + <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right"> + <template slot-scope="scope"> + <udOperation + :data="scope.row" + :permission="permission" + /> + </template> + </el-table-column> + </el-table> + <!--分页组件--> + <pagination /> + </div> + </div> +</template> + +<script> +import CRUD, { crud, header, presenter } from '@crud/crud' +import rrOperation from '@crud/RR.operation' +import crudOperation from '@crud/CRUD.operation' +import udOperation from '@crud/UD.operation' +import pagination from '@crud/Pagination' +export default { + name: 'InKilnReport', + components: { pagination, crudOperation, rrOperation, udOperation }, + mixins: [presenter(), header(), crud()], + cruds() { + return CRUD({ + title: '入窑记录报表', + url: 'api/report/inKilnReport', + optShow: { + add: false, + edit: false, + del: false, + download: false + } + }) + }, + data() { + return { + permission: { + }, + rules: { + } + } + }, + methods: { + // 钩子:在获取表格数据之前执行,false 则代表不获取数据 + [CRUD.HOOK.beforeRefresh]() { + return true + } + } +} +</script> + +<style scoped> + +</style> diff --git a/lms/nladmin-ui/src/views/wms/das/intoKiln/index.vue b/lms/nladmin-ui/src/views/wms/das/intoKiln/index.vue index ac0cdcf..e597214 100644 --- a/lms/nladmin-ui/src/views/wms/das/intoKiln/index.vue +++ b/lms/nladmin-ui/src/views/wms/das/intoKiln/index.vue @@ -8,6 +8,7 @@ <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="into_kiln_time" label="入窑时间" :min-width="flexWidth('into_kiln_time',crud.data,'入窑时间')" /> + <el-table-column prop="out_kiln_time" label="出窑时间" :min-width="flexWidth('out_kiln_time',crud.data,'入窑时间')" /> <el-table-column prop="vehicle_code" label="托盘号" :min-width="flexWidth('vehicle_code',crud.data,'托盘号')" /> <el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'数量')" /> <el-table-column prop="material_code" label="产品编码" :min-width="flexWidth('material_code',crud.data,'拆垛工位')" />