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

sgj

2025-12-25 68fae8cc33d80553355997554b06f5ac1395ef2c

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

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

@@ -478,12 +478,13 @@
        <Button layoutConstraint="left">
          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
var param = {&#xD;
    &quot;type&quot;:&quot;IN&quot;,&#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>
window.parent.$.table.exportExcelDorado(&quot;./export/inOutReport-excel&quot;, &quot;入库数据&quot;, param);</ClientEvent>
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="width">140</Property>
@@ -538,12 +539,13 @@
        <Button layoutConstraint="left">
          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
var param = {&#xD;
    &quot;type&quot;:&quot;IN&quot;,&#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>
window.parent.$.table.exportExcelDorado(&quot;./export/inOutReport-excel&quot;, &quot;入库数据&quot;, param);</ClientEvent>
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="width">140</Property>

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

@@ -80,6 +80,12 @@
        if(StringUtils.isEmpty(param.getDeptId())){
            param.setDeptId(param.getCompanyId());
        }
        if(StringUtils.isNotEmpty(param.getDeptId()) && StringUtils.isNotEmpty(param.getCompanyId())){
            String substring = param.getDeptId().substring(0, (param.getDeptId().length() - 3));
            if (!substring.equals(param.getCompanyId())){
                return new ArrayList<InoutRecord>();
            }
        }
        param.setCompanyId(null);
        inoutReportService.listPageInout(corePage, param);
        //获取查询到得list数据
@@ -93,11 +99,11 @@
        int index = 1;
        List<InoutRecord> list = new ArrayList<>();
        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)));
            }
            list.add(record);
            record.setRemarks(String.valueOf(index));
            emptyWeightSum += record.getEmptyWeight();
            fullWeightSum += record.getFullWeight();
            deOtherSum += record.getDeOther();

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

@@ -13,6 +13,11 @@
      <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>
      <PropertyDef name="progress">
        <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>
@@ -469,6 +474,15 @@
          <Property name="caption">重置</Property>
        </Button>
        <Button layoutConstraint="left">
          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
var param = {&#xD;
    &quot;type&quot;:&quot;OUT&quot;,&#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/inOutReport-excel&quot;, &quot;出库数据&quot;, param);</ClientEvent>
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="width">140</Property>
@@ -484,8 +498,8 @@
        <Property name="hideMode">display</Property>
        <Property name="visible">false</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>
@@ -520,6 +534,15 @@
          <Property name="caption">重置</Property>
        </Button>
        <Button layoutConstraint="left">
          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
var param = {&#xD;
    &quot;type&quot;:&quot;OUT&quot;,&#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/inOutReport-excel&quot;, &quot;出库数据&quot;, param);</ClientEvent>
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="width">140</Property>
@@ -603,59 +626,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">
@@ -675,55 +706,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/ReportOutDetailPR.java

@@ -76,6 +76,17 @@
        param.setType(Constant.TYPE_OUT);
        //多参数分页查询
        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());
        }
        if(StringUtils.isNotEmpty(param.getDeptId()) && StringUtils.isNotEmpty(param.getCompanyId())){
            String substring = param.getDeptId().substring(0, (param.getDeptId().length() - 3));
            if (!substring.equals(param.getCompanyId())){
                return new ArrayList<InoutRecord>();
            }
        }
        param.setCompanyId(null);
        inoutReportService.listPageInout(corePage, param);
        //获取查询到得list数据
        List<InoutRecord> result = corePage.getRecords();
@@ -88,6 +99,9 @@
        int index = 1;
        List<InoutRecord> list = new ArrayList<>();
        for (InoutRecord record : result) {
            if(StringUtils.isNotBlank(record.getDeptId())){
                record.setCompanyId(record.getDeptId().substring(0,(record.getDeptId().length()-3)));
            }
            list.add(record);
            record.setRemarks(String.valueOf(index));
            emptyWeightSum += record.getEmptyWeight();

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

@@ -2,14 +2,15 @@


import com.fzzy.igds.ReportInDetailPR;
import com.fzzy.igds.ReportOutDetailPR;
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.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -17,6 +18,7 @@
import org.springframework.web.bind.annotation.ResponseBody;

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


@@ -25,7 +27,6 @@
 *
 * @author sgj
 * @date 2025/12/24

 */
@Controller
@RequestMapping("export")
@@ -41,20 +42,33 @@
    @Autowired
    private ReportInDetailPR reportInDetailPR;

    @Autowired
    private ReportOutDetailPR reportOutDetailPR;



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

    public AjaxResult inOutReport(InoutParam param) {
        //设置标题
        String sheetName = "入库报表数据";
        String sheetName = "报表数据";
        //查询数据
        List<InoutRecord> list = new ArrayList<>();

        if (StringUtils.isNotEmpty(param.getType()) && "IN".equals(param.getType())) {
            sheetName = "入库报表数据";
            list = reportInDetailPR.listRecord(param);
        }

        if (StringUtils.isNotEmpty(param.getType()) && "OUT".equals(param.getType())) {
            sheetName = "出库报表数据";
            list = reportOutDetailPR.listRecord(param);
        }

        //获取分库编码对应的分库名称
        String deptName = "";
        SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));