入库报表列宽调整，映射调整，查询调整，导出实现

sgj

2025-12-24 cb248506e5944f49fef18c6e973fbd650b45dc03

入库报表列宽调整，映射调整，查询调整，导出实现

 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fzzy.igds.constant.Constant;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Column;
@@ -33,6 +34,7 @@
    public static String SORT_PROP = "id";

    @Id
    @Excel(name = "流水号",sort = 1)
    @Column(name = "id", columnDefinition = "varchar(14) COMMENT '流水号'")
    @TableField("id")
    private String id;
@@ -144,6 +146,8 @@

    @Column(name = "full_weight", columnDefinition = "decimal(20,2) COMMENT '满车称重(单位KG)'")
    @TableField("full_weight")

    @Excel(name = "满车称重",sort = 2)
    private Double fullWeight = 0.0;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -157,6 +161,7 @@

    @Column(name = "empty_weight", columnDefinition = "decimal(20,2) COMMENT '空车称重(单位KG)'")
    @TableField("empty_weight")
    @Excel(name = "空车称重",sort = 3)
    private Double emptyWeight = 0.0;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -170,18 +175,22 @@

    @Column(name = "net_weight", columnDefinition = "decimal(20,2) COMMENT '净重(单位KG)'")
    @TableField("net_weight")
    @Excel(name = "净重",sort = 5)
    private Double netWeight = 0.0;

    @Column(name = "de_other", columnDefinition = "decimal(20,2) COMMENT '扣重(单位KG)'")
    @TableField("de_other")
    @Excel(name = "扣重",sort = 4)
    private Double deOther = 0.0;

    @Column(name = "settle_weight", columnDefinition = "decimal(20,2) COMMENT '结算重量(单位KG)'")
    @TableField("settle_weight")
    @Excel(name = "结算重量",sort = 6)
    private Double settleWeight = 0.0;

    @Column(name = "record_weight", columnDefinition = "decimal(20,2) COMMENT '入库重量(单位KG)'")
    @TableField("record_weight")
    @Excel(name = "入库重量",sort = 7)
    private Double recordWeight = 0.0;



 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml

@@ -12,7 +12,12 @@
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">组织编码</Property>
        <Property name="label">收储公司</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">dwmc</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="progress">
        <Property></Property>
@@ -180,7 +185,7 @@
        <Property></Property>
        <Property name="label">装卸仓库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
@@ -315,7 +320,7 @@
        <Property></Property>
        <Property name="label">装卸仓库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
@@ -358,15 +363,6 @@
        <Property name="label">截止时间</Property>
        <Property name="dataType">Date</Property>
      </PropertyDef>
      <PropertyDef name="customerName">
        <Property></Property>
        <Property name="label">单位</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">dwmc</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="unit">
        <Property></Property>
        <Property name="label">单位</Property>
@@ -380,6 +376,15 @@
      </PropertyDef>
      <PropertyDef name="none">
        <Property></Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">收储公司</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">dwmc</Property>
        </Property>
      </PropertyDef>
    </DataType>
  </Model>
@@ -471,6 +476,14 @@
          <Property name="caption">重置</Property>
        </Button>
        <Button layoutConstraint="left">
          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
var param = {&#xD;
    &quot;depotId&quot;:data.get(&quot;depotId&quot;),&#xD;
    &quot;foodVariety&quot;:data.get(&quot;foodVariety&quot;),&#xD;
    &quot;start&quot;:data.get(&quot;start&quot;),&#xD;
    &quot;end&quot;:data.get(&quot;end&quot;)&#xD;
}&#xD;
window.parent.$.table.exportExcelDorado(&quot;./export/inReport-excel&quot;, &quot;入库数据&quot;, param);</ClientEvent>
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="width">140</Property>
@@ -487,8 +500,8 @@
        <Property name="visible">false</Property>
        <Property name="hideMode">display</Property>
        <AutoFormElement>
          <Property name="name">customerName</Property>
          <Property name="property">customerName</Property>
          <Property name="name">companyId</Property>
          <Property name="property">companyId</Property>
          <Property name="label">收储公司</Property>
          <Editor/>
        </AutoFormElement>
@@ -523,6 +536,14 @@
          <Property name="caption">重置</Property>
        </Button>
        <Button layoutConstraint="left">
          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
var param = {&#xD;
    &quot;deptId&quot;:data.get(&quot;deptId&quot;),&#xD;
    &quot;companyId&quot;:data.get(&quot;companyId&quot;),&#xD;
    &quot;start&quot;:data.get(&quot;start&quot;),&#xD;
    &quot;end&quot;:data.get(&quot;end&quot;)&#xD;
}&#xD;
window.parent.$.table.exportExcelDorado(&quot;./export/inReport-excel&quot;, &quot;入库数据&quot;, param);</ClientEvent>
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="width">140</Property>
@@ -606,59 +627,67 @@
        <RowNumColumn/>
        <DataColumn name="id">
          <Property name="property">id</Property>
          <Property name="width">130</Property>
          <Property name="width">150</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="plateNum">
          <Property name="property">plateNum</Property>
          <Property name="align">center</Property>
          <Property name="width">120</Property>
        </DataColumn>
        <DataColumn name="depotId">
          <Property name="property">depotId</Property>
          <Property name="caption">仓库</Property>
          <Property name="width">80</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn>
          <Property name="name">foodVariety</Property>
          <Property name="property">foodVariety</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn name="fullWeight">
          <Property name="property">fullWeight</Property>
          <Property name="caption">毛重</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn name="emptyWeight">
          <Property name="property">emptyWeight</Property>
          <Property name="caption">皮重</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn name="netWeight">
          <Property name="property">netWeight</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn>
          <Property name="name">deOther</Property>
          <Property name="property">deOther</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn name="settleWeight">
          <Property name="property">settleWeight</Property>
          <Property name="caption">结算重量</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">recordWeight</Property>
          <Property name="align">center</Property>
          <Property name="name">recordWeight</Property>
          <Property name="caption">入库重量</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">completeTime</Property>
          <Property name="align">center</Property>
          <Property name="name">completeTime</Property>
          <Property name="caption">离库时间</Property>
          <Property name="width">150</Property>
        </DataColumn>
      </DataGrid>
      <DataGrid id="dataGridMain2" layoutConstraint="padding:8">
@@ -678,55 +707,59 @@
          <Property name="caption">序号</Property>
        </RowNumColumn>
        <DataColumn>
          <Property name="property">customerName</Property>
          <Property name="property">companyId</Property>
          <Property name="caption">收储公司</Property>
          <Property name="width">80</Property>
          <Property name="align">center</Property>
          <Property name="name">customerName</Property>
          <Property name="name">companyId</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">deptId</Property>
          <Property name="caption">库区名称</Property>
          <Property name="width">80</Property>
          <Property name="width">250</Property>
          <Property name="align">center</Property>
          <Property name="name">deptId</Property>
        </DataColumn>
        <DataColumn name="id">
          <Property name="property">id</Property>
          <Property name="width">130</Property>
          <Property name="width">150</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="plateNum">
          <Property name="property">plateNum</Property>
          <Property name="align">center</Property>
          <Property name="width">120</Property>
        </DataColumn>
        <DataColumn name="depotId">
          <Property name="property">depotId</Property>
          <Property name="caption">仓库</Property>
          <Property name="width">80</Property>
          <Property name="width">120</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn>
          <Property name="name">foodVariety</Property>
          <Property name="property">foodVariety</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn name="settleWeight">
          <Property name="property">settleWeight</Property>
          <Property name="caption">结算重量</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">recordWeight</Property>
          <Property name="align">center</Property>
          <Property name="name">recordWeight</Property>
          <Property name="caption">入库重量</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">completeTime</Property>
          <Property name="align">center</Property>
          <Property name="name">completeTime</Property>
          <Property name="caption">离库时间</Property>
          <Property name="width">150</Property>
        </DataColumn>
        <DataColumn>
          <ClientEvent name="onRenderCell">//arg.dom.innerHTML = &quot;&lt;a href='javascript:;' onClick='detail()' class='a-btn1'>查看详情&lt;/a>&quot;;</ClientEvent>

 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java

@@ -76,6 +76,11 @@
        param.setType(Constant.TYPE_IN);
        //多参数分页查询
        com.baomidou.mybatisplus.extension.plugins.pagination.Page<InoutRecord> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(0, 10000);
        //收储公司查询处理
        if(StringUtils.isEmpty(param.getDeptId())){
            param.setDeptId(param.getCompanyId());
        }
        param.setCompanyId(null);
        inoutReportService.listPageInout(corePage, param);
        //获取查询到得list数据
        List<InoutRecord> result = corePage.getRecords();
@@ -90,6 +95,9 @@
        for (InoutRecord record : result) {
            list.add(record);
            record.setRemarks(String.valueOf(index));
            if(StringUtils.isNotBlank(record.getDeptId())){
                record.setCompanyId(record.getDeptId().substring(0,(record.getDeptId().length()-3)));
            }
            emptyWeightSum += record.getEmptyWeight();
            fullWeightSum += record.getFullWeight();
            deOtherSum += record.getDeOther();

 fzzy-igdss-view/src/main/java/com/fzzy/igds/export/ReportController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,70 @@
package com.fzzy.igds.export;


import com.fzzy.igds.ReportInDetailPR;
import com.fzzy.igds.data.InoutParam;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.InoutRecord;
import com.fzzy.igds.service.InoutRecordService;
import com.fzzy.igds.service.SysDeptService;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.List;


/**
 * æ•°æ®å¯¼å‡ºEXCEL入口
 *
 * @author sgj
 * @date 2025/12/24

 */
@Controller
@RequestMapping("export")
public class ReportController {


    @Resource
    private InoutRecordService inoutReportService;

    @Resource
    private SysDeptService sysDeptService;

    @Autowired
    private ReportInDetailPR reportInDetailPR;



    /**
     * å‡ºå…¥åº“报表导出
     * @return
     */
    @RequestMapping("/inReport-excel")
    @ResponseBody
    public AjaxResult inReportExcel(InoutParam param) {
        //查询数据
        List<InoutRecord> list = reportInDetailPR.listRecord(param);

        //设置标题
        String sheetName = "入库报表数据";
        //获取分库编码对应的分库名称
        String deptName = "";
        SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
        if (null != subDept) {
            deptName = subDept.getDeptName();
        }

        //导出
        ExcelUtil<InoutRecord> util = new ExcelUtil<InoutRecord>(InoutRecord.class);
        return util.exportExcel(list, sheetName, deptName);
    }

}