add: 窑内实时报表

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);
+    }
 }

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);
 }

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);
 }

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>

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;
+    }
 }

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;" />

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

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>

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,'拆垛工位')" />