细节调整2

czt

2026-01-19 5ffc5c22b0833d8f569e99eb775d08ca28676c7d

细节调整2

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

@@ -1,5 +1,6 @@
package com.fzzy.igds.data;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@@ -78,4 +79,9 @@
    private Double settleMoney;

    private Date updateTime = new Date();

    private String createUser;

    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime; // 创建时间
}

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

@@ -33,6 +33,9 @@

    private String createUser; // 创建人

    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime; // 创建时间

    private String timeDesc; // 时间描述
}


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

@@ -1,7 +1,10 @@
package com.fzzy.igds.data;


import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.util.Date;

/**
 *监管库存报表查询实体类
@@ -22,6 +25,7 @@

    private String createUser;

    private String createTime;
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime; // 创建时间

}

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

@@ -137,7 +137,7 @@
    var cur = view.get("#dgMain").get("selection");
    if(cur){
        var deptId = cur.get("id");
        var url = "/com.fzzy.igds.inoutConfManage.d?deptId="+ deptId;
        var url = "/com.fzzy.igds.InoutConfManage.d?deptId="+ deptId;
        window.$openTab("出入库配置", url);
    }else{
        $notify("请先选择库区……");

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

@@ -554,7 +554,7 @@
      </PropertyDef>
      <PropertyDef name="depotId">
        <Property></Property>
        <Property name="label">仓库名称</Property>
        <Property name="label">选择仓库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
@@ -563,11 +563,11 @@
      </PropertyDef>
      <PropertyDef name="start">
        <Property name="dataType">Date</Property>
        <Property name="label">检测日期</Property>
        <Property name="label">开始时间</Property>
      </PropertyDef>
      <PropertyDef name="end">
        <Property name="dataType">Date</Property>
        <Property name="label">检测时间</Property>
        <Property name="label">截止时间</Property>
      </PropertyDef>
      <PropertyDef name="createUser">
        <Property name="label">制表人</Property>
@@ -579,6 +579,7 @@
        <Property name="label">说明：</Property>
      </PropertyDef>
      <PropertyDef name="createTime">
        <Property name="dataType">DateTime</Property>
        <Property name="label">制表时间</Property>
      </PropertyDef>
      <PropertyDef name="timeDescLabel"/>
@@ -644,7 +645,7 @@
    <Container>
      <Property name="className">c-param</Property>
      <AutoForm>
        <Property name="cols">*,*,300,300,90,90</Property>
        <Property name="cols">*,*,280,280,90,90</Property>
        <Property name="dataSet">dataSetC</Property>
        <Property name="labelSeparator">：</Property>
        <Property name="labelAlign">right</Property>
@@ -689,12 +690,12 @@
    <Container>
      <Property name="className">c-data</Property>
      <AutoForm id="autoForm1" layoutConstraint="top">
        <Property name="cols">*,*,*,*</Property>
        <Property name="cols">*,*,300</Property>
        <Property name="dataSet">dataSetC</Property>
        <Property name="labelAlign">right</Property>
        <Property name="showHint">false</Property>
        <Property name="labelWidth">120</Property>
        <AutoFormElement layoutConstraint="colSpan:4">
        <AutoFormElement layoutConstraint="colSpan:3">
          <Property name="name">title</Property>
          <Property name="property">title</Property>
          <Property name="showLabel">false</Property>
@@ -709,15 +710,6 @@
          <Property name="name">timeDesc</Property>
          <Property name="property">timeDesc</Property>
          <Property name="editorType">Label</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">depotName</Property>
          <Property name="property">depotName</Property>
          <Property name="editorType">Label</Property>
          <Property name="labelAlign">right</Property>
          <Property name="labelWidth">80</Property>
          <Property name="showLabel">false</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>

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

@@ -66,11 +66,11 @@
        result.put("start", start);

        result.put("timeDesc",
                DateFormatUtils.format(start, "yyyy-MM-dd") + "   截至："
                DateFormatUtils.format(start, "yyyy-MM-dd") + "   至   "
                        + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));

        result.put("createUser", ContextUtil.getLoginUserName());
        result.put("createTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
        result.put("createTime", new Date());

        return result;
    }

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

@@ -88,17 +88,21 @@
      </PropertyDef>
      <PropertyDef name="start">
        <Property name="dataType">Date</Property>
        <Property name="label">检测时间开始</Property>
        <Property name="label">开始时间</Property>
      </PropertyDef>
      <PropertyDef name="end">
        <Property name="dataType">Date</Property>
        <Property name="label">检测时间截至</Property>
        <Property name="label">截止时间</Property>
      </PropertyDef>
      <PropertyDef name="createUser">
        <Property name="label">制表人</Property>
      </PropertyDef>
      <PropertyDef name="timeDesc">
        <Property name="label">时间</Property>
        <Property name="label">检测时间</Property>
      </PropertyDef>
      <PropertyDef name="createTime">
        <Property name="dataType">DateTime</Property>
        <Property name="label">制表时间</Property>
      </PropertyDef>
    </DataType>
  </Model>
@@ -126,7 +130,7 @@
    <Container>
      <Property name="className">c-param</Property>
      <AutoForm>
        <Property name="cols">*,*,*,*,90,90</Property>
        <Property name="cols">*,*,280,280,90,90</Property>
        <Property name="dataSet">dataSetC</Property>
        <Property name="labelSeparator">：</Property>
        <Property name="labelAlign">right</Property>
@@ -188,12 +192,12 @@
    <Container>
      <Property name="className">c-data</Property>
      <AutoForm id="autoForm1" layoutConstraint="top">
        <Property name="cols">*,*,*</Property>
        <Property name="cols">*,*,300</Property>
        <Property name="dataSet">dataSetC</Property>
        <Property name="labelAlign">right</Property>
        <Property name="showHint">false</Property>
        <Property name="labelWidth">120</Property>
        <AutoFormElement layoutConstraint="colSpan:4">
        <AutoFormElement layoutConstraint="colSpan:3">
          <Property name="name">title</Property>
          <Property name="property">title</Property>
          <Property name="showLabel">false</Property>
@@ -211,16 +215,14 @@
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">depotId</Property>
          <Property name="property">depotId</Property>
          <Property name="name">createUser</Property>
          <Property name="property">createUser</Property>
          <Property name="editorType">Label</Property>
          <Property name="labelWidth">110</Property>
          <Property name="labelAlign">right</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">createUser</Property>
          <Property name="property">createUser</Property>
          <Property name="name">createTime</Property>
          <Property name="property">createTime</Property>
          <Property name="editorType">Label</Property>
          <Editor/>
        </AutoFormElement>

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

@@ -17,11 +17,10 @@
import java.util.Date;

/**
 *数量检测数据报表
 * 数量检测数据报表
 *
 * @author sgj
 * @date 2025/12/18

 */
@Component
public class QuantityDataPR {
@@ -41,19 +40,21 @@
    public QuantityParam getQuery(String type) {
        QuantityParam result = new QuantityParam();
        SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
        result.setTitle("数量检测数据");
        result.setTitle("数量检测汇总表");
        if (null != subDept) {
            result.setTitle(subDept.getDeptName() + "数量检测数据");
            if(Constant.DEPT_TYPE_20.equals(subDept.getType())){
            result.setTitle(subDept.getDeptName() + "数量检测汇总表");
            if (Constant.DEPT_TYPE_20.equals(subDept.getType())) {
                result.setDeptId(String.valueOf(subDept.getDeptId()));
            }
        }
        result.setEnd(new Date());
        Date start = DateUtil.getNewByDay(new Date(), -90);
        Date start = DateUtil.getNewByDay(new Date(), -30);
        result.setStart(start);
        result.setTimeDesc(DateFormatUtils.format(start, "yyyy-MM-dd") + "   截至："
                + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
        result.setTimeDesc(
                DateFormatUtils.format(start, "yyyy-MM-dd") + "   至   "
                        + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
        result.setCreateUser(ContextUtil.getLoginUserName());
        result.setCreateTime(new Date());
        return result;
    }


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

@@ -369,7 +369,14 @@
      </PropertyDef>
      <PropertyDef name="timeDesc">
        <Property></Property>
        <Property name="label">时间</Property>
        <Property name="label">查询时间</Property>
      </PropertyDef>
      <PropertyDef name="createTime">
        <Property name="dataType">DateTime</Property>
        <Property name="label">制表时间</Property>
      </PropertyDef>
      <PropertyDef name="createUser">
        <Property name="label">制表人</Property>
      </PropertyDef>
      <PropertyDef name="title">
        <Property></Property>
@@ -458,7 +465,7 @@
    <Container>
      <Property name="className">c-param</Property>
      <AutoForm id="form1">
        <Property name="cols">*,*,*,*,90,90,140</Property>
        <Property name="cols">*,*,280,280,90,90,140</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="labelSeparator">：</Property>
        <Property name="labelAlign">right</Property>
@@ -516,7 +523,7 @@
        </Button>
      </AutoForm>
      <AutoForm id="form2">
        <Property name="cols">*,*,*,*,90,90,140</Property>
        <Property name="cols">*,*,280,280,90,90,140</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="labelSeparator">：</Property>
        <Property name="labelAlign">right</Property>
@@ -589,12 +596,12 @@
    <Container>
      <Property name="className">c-data</Property>
      <AutoForm id="autoForm1" layoutConstraint="top">
        <Property name="cols">*,*,*,*,*,*,*</Property>
        <Property name="cols">*,*,300</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="labelAlign">right</Property>
        <Property name="showHint">false</Property>
        <Property name="labelWidth">120</Property>
        <AutoFormElement layoutConstraint="colSpan:7">
        <AutoFormElement layoutConstraint="colSpan:3">
          <Property name="name">title</Property>
          <Property name="property">title</Property>
          <Property name="showLabel">false</Property>
@@ -605,43 +612,21 @@
          </Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement layoutConstraint="colSpan:2">
        <AutoFormElement>
          <Property name="name">timeDesc</Property>
          <Property name="property">timeDesc</Property>
          <Property name="editorType">Label</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">none</Property>
          <Property name="property">none</Property>
          <Property name="name">createUser</Property>
          <Property name="property">createUser</Property>
          <Property name="editorType">Label</Property>
          <Property name="showLabel">false</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">none</Property>
          <Property name="property">none</Property>
          <Property name="editorType">Label</Property>
          <Property name="showLabel">false</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">none</Property>
          <Property name="property">none</Property>
          <Property name="editorType">Label</Property>
          <Property name="showLabel">false</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">none</Property>
          <Property name="property">none</Property>
          <Property name="editorType">Label</Property>
          <Property name="showLabel">false</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">unit</Property>
          <Property name="property">unit</Property>
          <Property name="name">createTime</Property>
          <Property name="property">createTime</Property>
          <Property name="editorType">Label</Property>
          <Editor/>
        </AutoFormElement>

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

@@ -48,14 +48,16 @@
            result.setTitle(deptName + "入库明细汇总");
            result.setDeptId(deptId);
        }
        result.setUnit("千克（KG）");
        result.setEnd(new Date());
        Date start = DateUtil.getNewByDay(new Date(), -30);
        result.setStart(start);

        result.setTimeDesc(
                DateFormatUtils.format(start, "yyyy-MM-dd") + "   截至："
                DateFormatUtils.format(start, "yyyy-MM-dd") + "   至   "
                        + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));

        result.setCreateUser(ContextUtil.getLoginUserName());
        result.setCreateTime(new Date());
        return result;
    }


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

@@ -363,13 +363,20 @@
        <Property name="label">截止时间</Property>
        <Property name="dataType">Date</Property>
      </PropertyDef>
      <PropertyDef name="createTime">
        <Property name="dataType">DateTime</Property>
        <Property name="label">制表时间</Property>
      </PropertyDef>
      <PropertyDef name="createUser">
        <Property name="label">制表人</Property>
      </PropertyDef>
      <PropertyDef name="unit">
        <Property></Property>
        <Property name="label">单位</Property>
      </PropertyDef>
      <PropertyDef name="timeDesc">
        <Property></Property>
        <Property name="label">时间</Property>
        <Property name="label">查询时间</Property>
      </PropertyDef>
      <PropertyDef name="title">
        <Property></Property>
@@ -453,7 +460,7 @@
    <Container>
      <Property name="className">c-param</Property>
      <AutoForm id="form1" layoutConstraint="top">
        <Property name="cols">*,*,*,*,90,90,140</Property>
        <Property name="cols">*,*,280,280,90,90,140</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="exClassName">bg-color</Property>
        <Property name="labelWidth">110</Property>
@@ -510,7 +517,7 @@
        </Button>
      </AutoForm>
      <AutoForm id="form2" layoutConstraint="top">
        <Property name="cols">*,*,*,*,90,90,140</Property>
        <Property name="cols">*,*,280,280,90,90,140</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="exClassName">bg-color</Property>
        <Property name="labelWidth">110</Property>
@@ -581,12 +588,12 @@
    <Container layoutConstraint="center">
      <Property name="className">c-data</Property>
      <AutoForm id="autoForm1" layoutConstraint="top">
        <Property name="cols">*,*,*,*,*,*,*</Property>
        <Property name="cols">*,*,300</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="labelAlign">right</Property>
        <Property name="showHint">false</Property>
        <Property name="labelWidth">120</Property>
        <AutoFormElement layoutConstraint="colSpan:7">
        <AutoFormElement layoutConstraint="colSpan:3">
          <Property name="name">title</Property>
          <Property name="property">title</Property>
          <Property name="showLabel">false</Property>
@@ -597,43 +604,21 @@
          </Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement layoutConstraint="colSpan:2">
        <AutoFormElement>
          <Property name="name">timeDesc</Property>
          <Property name="property">timeDesc</Property>
          <Property name="editorType">Label</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">none</Property>
          <Property name="property">none</Property>
          <Property name="name">createUser</Property>
          <Property name="property">createUser</Property>
          <Property name="editorType">Label</Property>
          <Property name="showLabel">false</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">none</Property>
          <Property name="property">none</Property>
          <Property name="editorType">Label</Property>
          <Property name="showLabel">false</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">none</Property>
          <Property name="property">none</Property>
          <Property name="editorType">Label</Property>
          <Property name="showLabel">false</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">none</Property>
          <Property name="property">none</Property>
          <Property name="editorType">Label</Property>
          <Property name="showLabel">false</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">unit</Property>
          <Property name="property">unit</Property>
          <Property name="name">createTime</Property>
          <Property name="property">createTime</Property>
          <Property name="editorType">Label</Property>
          <Editor/>
        </AutoFormElement>

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

@@ -48,14 +48,16 @@
            result.setTitle(deptName + "出库明细汇总");
            result.setDeptId(deptId);
        }
        result.setUnit("千克（KG）");
        result.setEnd(new Date());
        Date start = DateUtil.getNewByDay(new Date(), -30);
        result.setStart(start);

        result.setTimeDesc(
                DateFormatUtils.format(start, "yyyy-MM-dd") + "   截至："
                DateFormatUtils.format(start, "yyyy-MM-dd") + "   至   "
                        + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));

        result.setCreateUser(ContextUtil.getLoginUserName());
        result.setCreateTime(new Date());
        return result;
    }


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

@@ -104,7 +104,7 @@
      </PropertyDef>
      <PropertyDef name="timeDesc">
        <Property></Property>
        <Property name="label">时间</Property>
        <Property name="label">查询时间</Property>
      </PropertyDef>
      <PropertyDef name="title">
        <Property></Property>
@@ -113,7 +113,8 @@
        <Property name="label">创建人</Property>
      </PropertyDef>
      <PropertyDef name="createTime">
        <Property name="label">创建时间</Property>
        <Property name="dataType">DateTime</Property>
        <Property name="label">制表时间</Property>
      </PropertyDef>
    </DataType>
  </Model>
@@ -152,7 +153,7 @@
    <Container>
      <Property name="className">c-param</Property>
      <AutoForm>
        <Property name="cols">*,*,*,*,90,90,140</Property>
        <Property name="cols">*,*,280,280,90,90,140</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="labelSeparator">：</Property>
        <Property name="labelAlign">right</Property>
@@ -210,12 +211,12 @@
    <Container>
      <Property name="className">c-data</Property>
      <AutoForm id="autoForm1" layoutConstraint="top">
        <Property name="cols">*,*,*,*</Property>
        <Property name="cols">*,*,300</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="labelAlign">right</Property>
        <Property name="showHint">false</Property>
        <Property name="labelWidth">120</Property>
        <AutoFormElement layoutConstraint="colSpan:4">
        <AutoFormElement layoutConstraint="colSpan:3">
          <Property name="name">title</Property>
          <Property name="property">title</Property>
          <Property name="showLabel">false</Property>
@@ -230,12 +231,6 @@
          <Property name="name">timeDesc</Property>
          <Property name="property">timeDesc</Property>
          <Property name="editorType">Label</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="visible">false</Property>
          <Property name="name">depotId</Property>
          <Property name="property">depotId</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>

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

@@ -38,9 +38,9 @@
    public SuperInventoryReportParam getQuery() {
        SuperInventoryReportParam result = new SuperInventoryReportParam();
        SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
        result.setTitle("库存报表");
        result.setTitle("库存汇总表");
        if (null != subDept) {
            result.setTitle(subDept.getDeptName() + "库存报表");
            result.setTitle(subDept.getDeptName() + "库存汇总表");
            result.setDeptId(String.valueOf(subDept.getDeptId()));
        }
        result.setTimeDesc("检测时间");
@@ -48,10 +48,10 @@
        Date start = DateUtil.getNewByDay(new Date(), -30);
        result.setStart(start);
        result.setTimeDesc(
                DateFormatUtils.format(start, "yyyy-MM-dd") + "   截至："
                DateFormatUtils.format(start, "yyyy-MM-dd") + "   至   "
                        + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
        result.setCreateUser(ContextUtil.getLoginUserName());
        result.setCreateTime(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
        result.setCreateTime(new Date());
        return result;
    }


 fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html

@@ -11,7 +11,7 @@
    <th:block th:include="include :: select2-css" />
    <style>
        .select-list .select2-container--bootstrap {
            width: 300px!important;
            width: 280px!important;
            display: inline-block;
        }
    </style>
@@ -45,9 +45,9 @@
                        </li>
                        <li class="select-time">
                            <label style="width: 100px">事件时间： </label>
                            <input type="text" class="time-input" style="width: 120px;" id="start" placeholder="开始时间" name="start"/>
                            <input type="text" class="time-input" style="width: 140px;" id="start" placeholder="开始时间" name="start"/>
                            <span>-</span>
                            <input type="text" class="time-input" style="width: 120px;" id="end" placeholder="结束时间" name="end"/>
                            <input type="text" class="time-input" style="width: 140px;" id="end" placeholder="结束时间" name="end"/>
                        </li>
                        <li>
                            <a class="btn btn-primary btn-rounded btn-sm" onclick="searchRecord()"><i

 fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html

@@ -11,7 +11,7 @@
    <th:block th:include="include :: select2-css"/>
    <style>
        .select-list .select2-container--bootstrap {
            width: 300px!important;
            width: 280px!important;
            display: inline-block;
        }
    </style>
@@ -44,10 +44,10 @@
                        </li>
                        <li class="select-time">
                            <label style="width: 100px">抓拍时间：</label>
                            <input type="text" class="time-input" style="width: 120px;" id="start"
                            <input type="text" class="time-input" style="width: 140px;" id="start"
                                   placeholder="开始时间" name="start"/>
                            <span>-</span>
                            <input type="text" class="time-input" style="width: 120px;" id="end" placeholder="结束时间"
                            <input type="text" class="time-input" style="width: 140px;" id="end" placeholder="结束时间"
                                   name="end"/>
                        </li>
                        <li>