报表：库存日报

pengyongcheng
1 parent 40aba46a
Showing 2 changed files with 306 additions and 5 deletions
ant-design-vue-jeecg/src/views/system/report/ReportInventoryDailyList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/report/controller/ReportController.java
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="物料编码">
+              <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="物料名称">
+              <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="物料规格">
+              <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="物料单位">
+              <a-input placeholder="请输入物料单位" v-model="queryParam.materialUnit"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button id="search" type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText">
+          <a-tag :key="inventoryStatus_dictText" :color="getStatusColor(inventoryStatus_dictText)">
+            {{ inventoryStatus_dictText }}
+          </a-tag>
+        </span>
+
+        <span slot="companyCode" slot-scope="companyCode">
+          <a-tag :key="companyCode" color=blue>
+            {{ solutionCompany(companyCode) }}
+          </a-tag>
+        </span>
+
+        <span slot="zoneCode" slot-scope="zoneCode">
+          <a-tag :key="zoneCode" color="blue">
+            {{ solutionZoneCode(zoneCode) }}
+          </a-tag>
+        </span>
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+      </a-table>
+    </div>
+    <inventory-transaction-modal ref="modalForm" @ok="modalFormOk"></inventory-transaction-modal>
+  </a-card>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import {mixinDevice} from '@/utils/mixin'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import {getCompanyList, getZoneList} from '@/api/api'
+
+export default {
+  name: 'ReportInventoryDailyList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {},
+  data() {
+    return {
+      description: '库存日报报表页面',
+      companyList: [],
+      zoneList: [],
+      zoneOptions: [],
+      firstLoad: 0,
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '物料编码',
+          align: "center",
+          dataIndex: 'materialCode'
+        },
+        {
+          title: '物料名称',
+          align: "center",
+          dataIndex: 'materialName'
+        },
+        {
+          title: '物料规格',
+          align: "center",
+          dataIndex: 'materialSpec'
+        },
+        {
+          title: '物料单位',
+          align: "center",
+          dataIndex: 'materialUnit'
+        },
+        {
+          title: '出入库总数',
+          align: "center",
+          dataIndex: 'qty'
+        },
+        {
+          title: '入库数量',
+          align: "center",
+          dataIndex: 'receiptQty'
+        },
+        {
+          title: '出库数量',
+          align: "center",
+          dataIndex: 'shipmentQty'
+        }
+      ],
+      url: {
+        list: "/report/listInventoryDaily",
+      },
+      dictOptions: {},
+      superFieldList: [],
+    }
+  },
+  created() {
+    this.getSuperFieldList();
+    this.loadFrom();
+  },
+  mounted() {
+    if (this.firstLoad === 0) {
+      this.firstLoad = 1;
+      return;
+    }
+    //页面没加载完,此时methods里的方法找不到,使用定时器模拟点击
+    let timeSearch = setInterval(() => {
+      let eleSearch = document.getElementById("search");
+      if (eleSearch != null) {
+        //调用成功,清除定时器
+        clearInterval(timeSearch)
+        eleSearch.click();
+      }
+    }, 200)
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+    getStatusColor(status) {
+      const colors = {
+        '良品': 'green',
+        '报废品': 'purple',
+        '待确认	': 'grey',
+        '次品': 'red',
+        default: 'blue'
+      };
+      return colors[status] || colors.default;
+    },
+    initDictConfig() {
+    },
+    loadFrom() {
+      getZoneList().then((res) => {
+        if (res.success) {
+          this.zoneList = res.result
+          //延迟半秒执行,避免组件未加载完,数据已经加载完
+          setTimeout(() => {
+            //slice可以在数组的任何位置进行删除/添加操作
+            this.zoneOptions.splice(0, 1);
+            for (const element of res.result) {
+              this.zoneOptions.push({value: element.code, text: element.name})
+            }
+          }, 500)
+        }
+      });
+      getCompanyList().then((res) => {
+        if (res.success) {
+          this.companyList = res.result
+        }
+      });
+    },
+    solutionZoneCode(value) {
+      let actions = []
+      Object.keys(this.zoneList).some(key => {
+        if (this.zoneList[key].code === '' + value) {
+          actions.push(this.zoneList[key].name)
+          return true
+        }
+      })
+      return actions.join('')
+    },
+    solutionCompany(value) {
+      let actions = []
+      Object.keys(this.companyList).some((key) => {
+        if (this.companyList[key].code === ('' + value)) {
+          actions.push(this.companyList[key].name)
+          return true
+        }
+      })
+      return actions.join('')
+    },
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({type: 'string', value: 'companyCode', text: '货主', dictCode: ''})
+      fieldList.push({type: 'string', value: 'containerCode', text: '容器编码', dictCode: ''})
+      fieldList.push({type: 'string', value: 'locationCode', text: '库位编码', dictCode: ''})
+      fieldList.push({type: 'int', value: 'type', text: '交易类型', dictCode: 'inventory_transaction_type'})
+      fieldList.push({type: 'string', value: 'materialCode', text: '物料编码', dictCode: ''})
+      fieldList.push({type: 'string', value: 'materialName', text: '物料名称', dictCode: ''})
+      fieldList.push({type: 'string', value: 'materialSpec', text: '物料规格', dictCode: ''})
+      fieldList.push({type: 'string', value: 'materialUnit', text: '物料单位', dictCode: ''})
+      fieldList.push({type: 'string', value: 'inventoryStatus', text: '库存状态', dictCode: 'inventory_status'})
+      fieldList.push({type: 'BigDecimal', value: 'qty', text: '数量', dictCode: ''})
+      fieldList.push({type: 'string', value: 'batch', text: '批次', dictCode: ''})
+      fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
+      fieldList.push({type: 'datetime', value: 'createTime', text: '创建日期'})
+      fieldList.push({type: 'string', value: 'updateBy', text: '更新人', dictCode: ''})
+      fieldList.push({type: 'datetime', value: 'updateTime', text: '更新日期'})
+      this.superFieldList = fieldList
+    }
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>
 \ No newline at end of file
 package org.jeecg.modules.wms.report.controller;
  
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -9,6 +12,7 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
  
+import cn.hutool.core.util.ObjectUtil;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -43,15 +47,11 @@ import lombok.extern.slf4j.Slf4j;
 @RequestMapping("/report")
 @Slf4j
 public class ReportController extends JeecgController<InventoryTransaction, IInventoryTransactionService> {
+
     @Autowired
     private IInventoryTransactionService inventoryTransactionService;
  
     @Resource
-    private HuahengJwtUtil huahengJwtUtil;
-
-    @Resource
-    private IParameterConfigurationService parameterConfigurationService;
-    @Resource
     private IMaterialService materialService;
     @Resource
     private ILocationService locationService;
@@ -143,4 +143,53 @@ public class ReportController extends JeecgController&lt;InventoryTransaction, IInv
         page.setRecords(locations);
         return Result.OK(page);
     }
+
+    /**
+     * 库存日报列表查询
+     */
+    @GetMapping(value = "/listInventoryDaily")
+    public Result listInventoryDaily(InventoryTransaction inventoryTransaction, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        // 查询当天的入库、出库交易记录
+        QueryWrapper<InventoryTransaction> queryWrapper = QueryGenerator.initQueryWrapper(inventoryTransaction, req.getParameterMap());
+        queryWrapper.ge("create_time", LocalDateTime.of(LocalDate.now(), LocalTime.MIN))
+                .and(wrapper -> wrapper.eq("type", QuantityConstant.INVENTORY_TRANSACTION_RECEIPT)
+                        .or().eq("type", QuantityConstant.INVENTORY_TRANSACTION_SHIPMENT));
+        List<InventoryTransaction> inventoryTransactionList = inventoryTransactionService.list(queryWrapper);
+        // 交易记录根据物料编码进行分组
+        Map<String, List<InventoryTransaction>> groupByMaterialCodeMap = inventoryTransactionList.stream().collect(Collectors.groupingBy(InventoryTransaction::getMaterialCode));
+        List<InventoryTransaction> inventoryTransactionReportList = new ArrayList<>();
+        for (Map.Entry<String, List<InventoryTransaction>> entry : groupByMaterialCodeMap.entrySet()) {
+            String materialCode = entry.getKey();
+            Material material = materialService.getMaterialByCode(materialCode);
+            InventoryTransaction inventoryTransactionReport = new InventoryTransaction();
+            if (material != null) {
+                inventoryTransactionReport.setMaterialName(material.getName());
+                inventoryTransactionReport.setMaterialUnit(material.getUnit());
+                inventoryTransactionReport.setMaterialSpec(material.getSpec());
+            }
+            inventoryTransactionReport.setMaterialCode(materialCode);
+            List<InventoryTransaction> inventoryTransactions = entry.getValue();
+            // 求和 数量、入库数量、出库数量
+            BigDecimal qtySum = inventoryTransactions.stream()
+                    .map(InventoryTransaction::getQty)
+                    .filter(ObjectUtil::isNotEmpty)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal receiptQtySum = inventoryTransactions.stream()
+                    .map(InventoryTransaction::getReceiptQty)
+                    .filter(ObjectUtil::isNotEmpty)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal shipmentQtySum = inventoryTransactions.stream()
+                    .map(InventoryTransaction::getShipmentQty)
+                    .filter(ObjectUtil::isNotEmpty)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            inventoryTransactionReport.setQty(qtySum);
+            inventoryTransactionReport.setReceiptQty(receiptQtySum);
+            inventoryTransactionReport.setShipmentQty(shipmentQtySum);
+            inventoryTransactionReportList.add(inventoryTransactionReport);
+        }
+        Page<InventoryTransaction> page = new Page<>(pageNo, pageSize);
+        page.setRecords(inventoryTransactionReportList);
+        return Result.OK(page);
+    }
 }