报表问题修改

sgj

2026-02-13 1cd2e610fdbd581f609e002e738b0e5cea97ad40

报表问题修改

 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailInExport.java

@@ -35,10 +35,10 @@
    private String foodVariety;

    @Excel(name = "结算重量",sort = 7)
    private Double settleWeight = 0.0;
    private String settleWeight = "0.0";

    @Excel(name = "入库重量",sort = 8)
    private Double recordWeight = 0.0;
    private String recordWeight = "0.0";

    @Excel(name = "离库时间",sort = 9,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date completeTime;

 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailOutExport.java

@@ -35,10 +35,10 @@
    private String foodVariety;

    @Excel(name = "结算重量",sort = 7)
    private Double settleWeight = 0.0;
    private String settleWeight = "0.0";

    @Excel(name = "出库重量",sort = 8)
    private Double recordWeight = 0.0;
    private String recordWeight = "0.0";

    @Excel(name = "离库时间",sort = 9,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date completeTime;

 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordInExport.java

@@ -30,22 +30,22 @@
    private String foodVariety;

    @Excel(name = "毛重",sort = 5)
    private Double fullWeight = 0.0;
    private String fullWeight = "0.0";

    @Excel(name = "皮重",sort = 6)
    private Double emptyWeight = 0.0;
    private String emptyWeight= "0.0";

    @Excel(name = "净重",sort = 7)
    private Double netWeight = 0.0;
    private String netWeight = "0.0";

    @Excel(name = "扣重",sort = 8)
    private Double deOther = 0.0;
    private String deOther = "0.0";

    @Excel(name = "结算重量",sort = 9)
    private Double settleWeight = 0.0;
    private String settleWeight = "0.0";

    @Excel(name = "入库重量",sort = 10)
    private Double recordWeight = 0.0;
    private String recordWeight = "0.0";

    @Excel(name = "离库时间",sort = 11,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date completeTime;

 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordOutExport.java

@@ -30,22 +30,22 @@
    private String foodVariety;

    @Excel(name = "毛重",sort = 5)
    private Double fullWeight = 0.0;
    private String fullWeight = "0.0";

    @Excel(name = "皮重",sort = 6)
    private Double emptyWeight = 0.0;
    private String emptyWeight = "0.0";

    @Excel(name = "净重",sort = 7)
    private Double netWeight = 0.0;
    private String netWeight = "0.0";

    @Excel(name = "扣重",sort = 8)
    private Double deOther = 0.0;
    private String deOther = "0.0";

    @Excel(name = "结算重量",sort = 9)
    private Double settleWeight = 0.0;
    private String settleWeight = "0.0";

    @Excel(name = "出库重量",sort = 10)
    private Double recordWeight = 0.0;
    private String recordWeight = "0.0";

    @Excel(name = "离库时间",sort = 11,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date completeTime;

 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/SuperInventoryReportExport.java

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

import com.ruoyi.common.annotation.Excel;
import lombok.Data;

import java.io.Serializable;

/**
 * ç›‘管库存报表数据
 *
 * @author sgj
 * @date 2025/12/19
 */
@Data
public class SuperInventoryReportExport implements Serializable {

    @Excel(name = "收储公司", sort = 1)
    private String customerName;


    @Excel(name = "所属库区", sort = 2)
    private String deptName;



    @Excel(name = "所属仓库", sort = 3)
    private String depotName;


    /**
     * æœŸåˆæ•°é‡(单位KG)
     */
    @Excel(name = "期初数量(单位KG)", sort = 4)
    private String initialWeight = "0.0";

    /**
     * å…¥åº“数量(单位KG)
     */
    @Excel(name = "入库数量(单位KG)", sort = 5)
    private String recordInWeight = "0.0";

    /**
     * å€’入数量(单位KG)
     */
    @Excel(name = "倒入数量(单位KG)", sort = 6)
    private String changeInWeight = "0.0";

    /**
     * å‡ºåº“数量(单位KG)
     */
    @Excel(name = "出库数量(单位KG)", sort = 7)
    private String recordOutWeight = "0.0";

    /**
     * å€’出数量(单位KG)
     */
    @Excel(name = "倒出数量(单位KG)", sort = 8)
    private String changeOutWeight = "0.0";

    /**
     * æŸè€—数量(单位KG)
     */
    @Excel(name = "损耗数量(单位KG)", sort = 9)
    private String lossWeight = "0.0";

    /**
     * æœŸæœ«æ•°é‡(单位KG)
     */
    @Excel(name = "期末数量(单位KG)", sort = 10)
    private String finalWeight = "0.0";

}

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

@@ -403,14 +403,12 @@
if(ViewType==1){
 view.get("#form1").set("visible",true);
 view.get("#dataGridMain1").set("visible",true);
  view.get("#tool").set("visible",true);

}

if(ViewType==2){
 view.get("#form2").set("visible",true);
 view.get("#dataGridMain2").set("visible",true);
  view.get("#tool").set("visible",true);
}

var deptId = window.parent.DEPT_ID;//父页面中的分库编码
@@ -722,6 +720,7 @@
        <RowSelectorColumn/>
        <RowNumColumn>
          <Property name="caption">序号</Property>
          <Property name="width">30</Property>
        </RowNumColumn>
        <DataColumn>
          <Property name="property">companyId</Property>
@@ -783,15 +782,6 @@
          <Editor/>
        </DataColumn>
      </DataGrid>
      <ToolBar id="tool" layoutConstraint="bottom">
        <Property name="hideMode">display</Property>
        <Property name="visible">false</Property>
        <Fill/>
        <DataPilot layoutConstraint="right">
          <Property name="itemCodes">pageSize,pages</Property>
          <Property name="dataSet">dsMain</Property>
        </DataPilot>
      </ToolBar>
    </Container>
    <Dialog id="dialogImg">
      <Property name="width">55%</Property>

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

@@ -15,7 +15,9 @@
import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.text.DecimalFormat;
import java.util.*;

/**
@@ -51,20 +53,20 @@
        result.put("deptId", deptId);

        //获取分库编码对应的分库名称
        String deptName = "";
        SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
        if (null != subDept) {
            deptName = subDept.getDeptName();
        }
//        String deptName = "";
//        SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
//        if (null != subDept) {
//            deptName = subDept.getDeptName();
//        }
        String title = "汇总表";
        if ("IN".equals(type)) {
            title= deptName + "入库明细汇总";
            title =  "入库明细汇总";
        }
        if ("OUT".equals(type)) {
            title= deptName + "出库明细汇总";
            title =  "出库明细汇总";
        }
        if ("STORE".equals(type)) {
            title= deptName + "库存汇总表";
            title =  "库存汇总表";
        }

        result.put("end", new Date());
@@ -78,7 +80,6 @@
        result.put("createTime", new Date());
        result.put("title", title);
        result.put("type", type);


        return result;
    }
@@ -98,12 +99,12 @@
        result.put("deptId", deptId);

        //获取分库编码对应的分库名称
        String deptName = "";
        SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
        if (null != subDept) {
            deptName = subDept.getDeptName();
        }
        String title = deptName + "库存汇总表";
//        String deptName = "";
//        SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
//        if (null != subDept) {
//            deptName = subDept.getDeptName();
//        }
        String title = "库存汇总表";

        result.put("end", new Date());
        Date start = DateUtil.getNewByDay(new Date(), -30);
@@ -115,7 +116,6 @@
        result.put("createUser", ContextUtil.getLoginUserName());
        result.put("createTime", new Date());
        result.put("title", title);


        return result;
    }

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

@@ -403,13 +403,11 @@
if(ViewType==1){&#xD;
 view.get(&quot;#form1&quot;).set(&quot;visible&quot;,true);&#xD;
 view.get(&quot;#dataGridMain1&quot;).set(&quot;visible&quot;,true);&#xD;
  view.get(&quot;#tool&quot;).set(&quot;visible&quot;,true);&#xD;
}&#xD;
&#xD;
if(ViewType==2){&#xD;
 view.get(&quot;#form2&quot;).set(&quot;visible&quot;,true);&#xD;
 view.get(&quot;#dataGridMain2&quot;).set(&quot;visible&quot;,true);&#xD;
  view.get(&quot;#tool&quot;).set(&quot;visible&quot;,true);&#xD;
}&#xD;
&#xD;
var deptId = window.parent.DEPT_ID;//父页面中的分库编码&#xD;
@@ -714,6 +712,7 @@
        <RowSelectorColumn/>
        <RowNumColumn>
          <Property name="caption">序号</Property>
          <Property name="width">30</Property>
        </RowNumColumn>
        <DataColumn>
          <Property name="property">companyId</Property>
@@ -774,15 +773,6 @@
          <Editor/>
        </DataColumn>
      </DataGrid>
      <ToolBar id="tool" layoutConstraint="bottom">
        <Property name="hideMode">display</Property>
        <Property name="visible">false</Property>
        <Fill/>
        <DataPilot layoutConstraint="right">
          <Property name="itemCodes">pageSize,pages</Property>
          <Property name="dataSet">dsMain</Property>
        </DataPilot>
      </ToolBar>
    </Container>
    <Dialog id="dialogImg">
      <Property name="width">55%</Property>

 fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java

@@ -21,6 +21,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -130,7 +131,7 @@
                .orElse(new ArrayList<>())
                .stream()
                .collect(Collectors.toMap(Depot::getId, Depot::getName, (key1, key2) -> key2));

        DecimalFormat df = new DecimalFormat("0.00");
        //组装实际导出数据
        if (StringUtils.isNotEmpty(param.getType()) && "IN".equals(param.getType())) {
            sheetName = "入库报表数据";
@@ -147,13 +148,13 @@
                //粮食品种映射
                String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
                export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
                export.setFullWeight(record.getFullWeight());
                export.setEmptyWeight(record.getEmptyWeight());
                export.setNetWeight(record.getNetWeight());
                export.setSettleWeight(record.getSettleWeight());
                export.setRecordWeight(record.getRecordWeight());
                export.setFullWeight(df.format(record.getFullWeight())+"KG");
                export.setEmptyWeight(df.format(record.getEmptyWeight())+"KG");
                export.setNetWeight(df.format(record.getNetWeight())+"KG");
                export.setSettleWeight(df.format(record.getSettleWeight())+"KG");
                export.setRecordWeight(df.format(record.getRecordWeight())+"KG");
                export.setCompleteTime(record.getCompleteTime());
                export.setDeOther(record.getDeOther());
                export.setDeOther(df.format(record.getDeOther())+"KG");
                export.setUpdateLog(record.getUpdateLog());
                exportList.add(export);
            }
@@ -176,13 +177,13 @@
                //粮食品种映射
                String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
                export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
                export.setFullWeight(record.getFullWeight());
                export.setEmptyWeight(record.getEmptyWeight());
                export.setNetWeight(record.getNetWeight());
                export.setSettleWeight(record.getSettleWeight());
                export.setRecordWeight(record.getRecordWeight());
                export.setFullWeight(df.format(record.getFullWeight())+"KG");
                export.setEmptyWeight(df.format(record.getEmptyWeight())+"KG");
                export.setNetWeight(df.format(record.getNetWeight())+"KG");
                export.setSettleWeight(df.format(record.getSettleWeight())+"KG");
                export.setRecordWeight(df.format(record.getRecordWeight())+"KG");
                export.setCompleteTime(record.getCompleteTime());
                export.setDeOther(record.getDeOther());
                export.setDeOther(df.format(record.getDeOther())+"KG");
                export.setUpdateLog(record.getUpdateLog());
                exportList.add(export);
            }
@@ -192,6 +193,7 @@

        if (StringUtils.isNotEmpty(param.getType()) && "IN_DETAIL".equals(param.getType())) {
            sheetName = "入库明细报表数据";
            param.setType("IN");
            list = reportInoutPR.listRecord(param);
            List<InoutRecordDetailInExport> exportList = new ArrayList<>();
            InoutRecordDetailInExport export;
@@ -211,8 +213,8 @@
                //粮食品种映射
                String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
                export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
                export.setSettleWeight(record.getSettleWeight());
                export.setRecordWeight(record.getRecordWeight());
                export.setSettleWeight(df.format(record.getSettleWeight())+"KG");
                export.setRecordWeight(df.format(record.getRecordWeight())+"KG");
                export.setCompleteTime(record.getCompleteTime());
                export.setUpdateLog(record.getUpdateLog());
                exportList.add(export);
@@ -223,6 +225,7 @@

        if (StringUtils.isNotEmpty(param.getType()) && "OUT_DETAIL".equals(param.getType())) {
            sheetName = "出库明细报表数据";
            param.setType("OUT");
            list = reportInoutPR.listRecord(param);
            List<InoutRecordDetailOutExport> exportList = new ArrayList<>();
            InoutRecordDetailOutExport export;
@@ -242,8 +245,8 @@
                //粮食品种映射
                String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
                export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
                export.setSettleWeight(record.getSettleWeight());
                export.setRecordWeight(record.getRecordWeight());
                export.setSettleWeight(df.format(record.getSettleWeight())+"KG");
                export.setRecordWeight(df.format(record.getRecordWeight())+"KG");
                export.setCompleteTime(record.getCompleteTime());
                export.setUpdateLog(record.getUpdateLog());
                exportList.add(export);
@@ -271,10 +274,27 @@
        if (null != subDept) {
            deptName = subDept.getDeptName();
        }
        List<SuperInventoryReportExport> exportList = new ArrayList<>();
        DecimalFormat df = new DecimalFormat("0.00");

        for (SuperInventoryReportData data :list) {
            SuperInventoryReportExport export = new SuperInventoryReportExport();
            export.setCustomerName(data.getCustomerName());
            export.setDeptName(data.getDeptName());
            export.setDepotName(data.getDepotName());
            export.setInitialWeight(df.format(data.getInitialWeight())+"KG");
            export.setRecordInWeight(df.format(data.getRecordInWeight())+"KG");
            export.setChangeInWeight(df.format(data.getChangeInWeight())+"KG");
            export.setRecordOutWeight(df.format(data.getRecordOutWeight())+"KG");
            export.setChangeOutWeight(df.format(data.getChangeOutWeight())+"KG");
            export.setLossWeight(df.format(data.getLossWeight())+"KG");
            export.setFinalWeight(df.format(data.getFinalWeight())+"KG");
            exportList.add(export);
        }

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

}