客户问题优化调整9

czt

2026-02-11 f68f5bf6ae56c18561eb8ccba9fb9693f128551c

客户问题优化调整9

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

@@ -42,4 +42,7 @@

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

    @Excel(name = "修改记录",sort = 10)
    private String updateLog;
}

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

@@ -42,4 +42,7 @@

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

    @Excel(name = "修改记录",sort = 10)
    private String updateLog;
}

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

@@ -49,4 +49,7 @@

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

    @Excel(name = "修改记录",sort = 12)
    private String updateLog;
}

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

@@ -49,4 +49,7 @@

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

    @Excel(name = "修改记录",sort = 12)
    private String updateLog;
}

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

@@ -235,6 +235,11 @@
    @TableField("remarks")
    private String remarks;

    @Excel(name = "修改记录",sort = 8)
    @Column(name = "update_log", columnDefinition = "varchar(500) COMMENT '修改记录'")
    @TableField("update_log")
    private String updateLog;

    /**
     * ----------- 值仓时间，手机端使用-----------------------
     **/

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java

@@ -68,6 +68,8 @@
        queryWrapper.eq("company_id", param.getCompanyId());
        if (StringUtils.isNotBlank(param.getDeptId())) {
            queryWrapper.eq("dept_id", param.getDeptId());
        }else {
            queryWrapper.likeRight("dept_id", ContextUtil.subDeptId(null));
        }
        if (StringUtils.isNotBlank(param.getCustomerName())) {
            queryWrapper.like("customer_name", param.getCustomerName());
@@ -267,6 +269,8 @@
        queryWrapper.eq("company_id", param.getCompanyId());
        if (StringUtils.isNotBlank(param.getDeptId())) {
            queryWrapper.eq("dept_id", param.getDeptId());
        }else {
            queryWrapper.likeRight("dept_id", ContextUtil.subDeptId(null));
        }
        if (StringUtils.isNotBlank(param.getCustomerName())) {
            queryWrapper.like("customer_name", param.getCustomerName());

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.bill.InoutBill;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.FoodLevel;
import com.fzzy.igds.constant.FoodVariety;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.data.IgdsBaseParam;
@@ -149,13 +150,14 @@

    /**
     * 根据时间类型，获取已完成的正常单据
     *
     * @param timeType
     * @param param
     * @return
     */
    public List<InoutRecord> getCompleteInoutByTime(String timeType, IgdsBaseParam param) {
        if(StringUtils.isBlank(timeType)){
             return null;
        if (StringUtils.isBlank(timeType)) {
            return null;
        }

        QueryWrapper<InoutRecord> queryWrapper = new QueryWrapper<>();
@@ -262,7 +264,7 @@
     * @return
     */
    public String addInoutRecordList(List<InoutRecord> list) {
        if(null == list || list.isEmpty()){
        if (null == list || list.isEmpty()) {
            return "新增失败";
        }

@@ -323,6 +325,7 @@

    /**
     * 数据修改，保留修改记录
     *
     * @param updateData
     * @return
     */
@@ -333,220 +336,224 @@
        param.setId(updateData.getId());
        InoutRecord record = this.selectOne(param);

        String remarks = checkRemarks(updateData, record);
        updateData.setRemarks(remarks);
        String updateLog = checkRemarks(updateData, record);
        updateData.setUpdateLog(updateLog);

        return updateInoutRecord(updateData);
    }

    /**
     * 校验修改信息
     * @param updateData  修改数据
     * @param record      原始数据
     *
     * @param updateData 修改数据
     * @param record     原始数据
     * @return
     */
    public String checkRemarks(InoutRecord updateData, InoutRecord record) {

        String remarks = "【" + ContextUtil.getLoginUserName() + "】于["+DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"]修改数据：";
        String updateLog0 = "【" + ContextUtil.getLoginUserName() + "】于[" + DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss") + "]修改数据：";
        String updateLog = "";

        boolean updateTag = false;
        //校验仓库信息
        if(null != updateData.getDepotId() && null != record.getDepotId()){
        if (null != updateData.getDepotId() && null != record.getDepotId()) {
            updateTag = !updateData.getDepotId().equals(record.getDepotId());
            if(updateTag){
                remarks += "[仓库编码](" + record.getDepotId() + ")修改为(" + updateData.getDepotId() + "),";
            if (updateTag) {
                updateLog += "[仓库编码](" + record.getDepotId() + ")修改为(" + updateData.getDepotId() + "),";
            }
        }

        //校验品种信息
        if(null != updateData.getFoodVariety() && null != record.getFoodVariety()){
        if (null != updateData.getFoodVariety() && null != record.getFoodVariety()) {
            updateTag = !updateData.getFoodVariety().equals(record.getFoodVariety());
            if(updateTag){
                remarks += "[品种](" + record.getFoodVariety() + ")修改为(" + updateData.getFoodVariety() + "),";
            if (updateTag) {
                updateLog += "[品种](" + FoodVariety.getMsg(record.getFoodVariety()) + ")修改为(" + FoodVariety.getMsg(updateData.getFoodVariety()) + "),";
            }
        }

        //粮食产地
        if(null != updateData.getFoodLocation() && null != record.getFoodLocation()){
        if (null != updateData.getFoodLocation() && null != record.getFoodLocation()) {
            updateTag = !updateData.getFoodLocation().equals(record.getFoodLocation());
            if(updateTag){
                remarks += "[粮食产地](" + record.getFoodLocation() + ")修改为(" + updateData.getFoodLocation() + "),";
            if (updateTag) {
                updateLog += "[粮食产地](" + record.getFoodLocation() + ")修改为(" + updateData.getFoodLocation() + "),";
            }
        }

        //粮食等级
        if(null != updateData.getFoodLevel() && null != record.getFoodLevel()){
        if (null != updateData.getFoodLevel() && null != record.getFoodLevel()) {
            updateTag = !updateData.getFoodLevel().equals(record.getFoodLevel());
            if(updateTag){
                remarks += "[粮食等级](" + record.getFoodLevel() + ")修改为(" + updateData.getFoodLevel() + "),";
            if (updateTag) {
                updateLog += "[粮食等级](" + FoodLevel.getMsg(record.getFoodLevel()) + ")修改为(" + FoodLevel.getMsg(updateData.getFoodLevel()) + "),";
            }
        }

        //粮食年份
        if(null != updateData.getFoodYear() && null != record.getFoodYear()){
        if (null != updateData.getFoodYear() && null != record.getFoodYear()) {
            updateTag = !updateData.getFoodYear().equals(record.getFoodYear());
            if(updateTag){
                remarks += "[粮食年份](" + record.getFoodYear() + ")修改为(" + updateData.getFoodYear() + "),";
            if (updateTag) {
                updateLog += "[粮食年份](" + record.getFoodYear() + ")修改为(" + updateData.getFoodYear() + "),";
            }
        }

        //承运人
        if(null != updateData.getUserName() && null != record.getUserName()){
        if (null != updateData.getUserName() && null != record.getUserName()) {
            updateTag = !updateData.getUserName().equals(record.getUserName());
            if(updateTag){
                remarks += "[承运人](" + record.getUserName() + ")修改为(" + updateData.getUserName() + "),";
            if (updateTag) {
                updateLog += "[承运人](" + record.getUserName() + ")修改为(" + updateData.getUserName() + "),";
            }
        }

        //校验通知单信息
        if(null != updateData.getNoticeId() && null != record.getNoticeId()){
        if (null != updateData.getNoticeId() && null != record.getNoticeId()) {
            updateTag = !updateData.getNoticeId().equals(record.getNoticeId());
            if(updateTag){
                remarks += "[通知单编码](" + record.getNoticeId() + ")修改为(" + updateData.getNoticeId() + "),";
            if (updateTag) {
                updateLog += "[通知单编码](" + record.getNoticeId() + ")修改为(" + updateData.getNoticeId() + "),";
            }
        }

        //校验往来单位信息
        if(null != updateData.getCustomerName() && null != record.getCustomerName()){
        if (null != updateData.getCustomerName() && null != record.getCustomerName()) {
            updateTag = !updateData.getCustomerName().equals(record.getCustomerName());
            if(updateTag){
                remarks += "[往来单位](" + record.getCustomerName() + ")修改为(" + updateData.getCustomerName() + "),";
            if (updateTag) {
                updateLog += "[往来单位](" + record.getCustomerName() + ")修改为(" + updateData.getCustomerName() + "),";
            }
        }

        //单价
        if(null != updateData.getPrice() && null != record.getPrice()){
        if (null != updateData.getPrice() && null != record.getPrice()) {
            updateTag = !updateData.getPrice().equals(record.getPrice());
            if(updateTag){
                remarks += "[单价](" + record.getPrice() + ")修改为(" + updateData.getPrice() + "),";
            if (updateTag) {
                updateLog += "[单价](" + record.getPrice() + ")修改为(" + updateData.getPrice() + "),";
            }
        }

        //结算金额
        if(null != updateData.getSettleMoney() && null != record.getSettleMoney()){
        if (null != updateData.getSettleMoney() && null != record.getSettleMoney()) {
            updateTag = !updateData.getSettleMoney().equals(record.getSettleMoney());
            if(updateTag){
                remarks += "[结算金额](" + record.getSettleMoney() + ")修改为(" + updateData.getSettleMoney() + "),";
            if (updateTag) {
                updateLog += "[结算金额](" + record.getSettleMoney() + ")修改为(" + updateData.getSettleMoney() + "),";
            }
        }

        //水分
        if(null != updateData.getPerWet() && null != record.getPerWet()){
        if (null != updateData.getPerWet() && null != record.getPerWet()) {
            updateTag = !updateData.getPerWet().equals(record.getPerWet());
            if(updateTag){
                remarks += "[水分](" + record.getPerWet() + ")修改为(" + updateData.getPerWet() + "),";
            if (updateTag) {
                updateLog += "[水分](" + record.getPerWet() + ")修改为(" + updateData.getPerWet() + "),";
            }
        }

        //杂质
        if(null != updateData.getPerImpurity() && null != record.getPerImpurity()){
        if (null != updateData.getPerImpurity() && null != record.getPerImpurity()) {
            updateTag = !updateData.getPerImpurity().equals(record.getPerImpurity());
            if(updateTag){
                remarks += "[杂质](" + record.getPerImpurity() + ")修改为(" + updateData.getPerImpurity() + "),";
            if (updateTag) {
                updateLog += "[杂质](" + record.getPerImpurity() + ")修改为(" + updateData.getPerImpurity() + "),";
            }
        }

        //毛重
        if(null != updateData.getFullWeight() && null != record.getFullWeight()){
        if (null != updateData.getFullWeight() && null != record.getFullWeight()) {
            updateTag = !updateData.getFullWeight().equals(record.getFullWeight());
            if(updateTag){
                remarks += "[毛重](" + record.getFullWeight() + ")修改为(" + updateData.getFullWeight() + "),";
            if (updateTag) {
                updateLog += "[毛重](" + record.getFullWeight() + ")修改为(" + updateData.getFullWeight() + "),";
            }
        }

        //皮重
        if(null != updateData.getEmptyWeight() && null != record.getEmptyWeight()){
        if (null != updateData.getEmptyWeight() && null != record.getEmptyWeight()) {
            updateTag = !updateData.getEmptyWeight().equals(record.getEmptyWeight());
            if(updateTag){
                remarks += "[皮重](" + record.getEmptyWeight() + ")修改为(" + updateData.getEmptyWeight() + "),";
            if (updateTag) {
                updateLog += "[皮重](" + record.getEmptyWeight() + ")修改为(" + updateData.getEmptyWeight() + "),";
            }
        }

        //扣重
        if(null != updateData.getDeOther() && null != record.getDeOther()){
        if (null != updateData.getDeOther() && null != record.getDeOther()) {
            updateTag = !updateData.getDeOther().equals(record.getDeOther());
            if(updateTag){
                remarks += "[扣重](" + record.getDeOther() + ")修改为(" + updateData.getDeOther() + "),";
            if (updateTag) {
                updateLog += "[扣重](" + record.getDeOther() + ")修改为(" + updateData.getDeOther() + "),";
            }
        }

        //结算重量
        if(null != updateData.getSettleWeight() && null != record.getSettleWeight()){
        if (null != updateData.getSettleWeight() && null != record.getSettleWeight()) {
            updateTag = !updateData.getSettleWeight().equals(record.getSettleWeight());
            if(updateTag){
                remarks += "[结算重量](" + record.getSettleWeight() + ")修改为(" + updateData.getSettleWeight() + "),";
            if (updateTag) {
                updateLog += "[结算重量](" + record.getSettleWeight() + ")修改为(" + updateData.getSettleWeight() + "),";
            }
        }

        //出入库重量
        if(null != updateData.getRecordWeight() && null != record.getRecordWeight()){
        if (null != updateData.getRecordWeight() && null != record.getRecordWeight()) {
            updateTag = !updateData.getRecordWeight().equals(record.getRecordWeight());
            if(updateTag){
                remarks += "[出入库重量](" + record.getRecordWeight() + ")修改为(" + updateData.getRecordWeight() + "),";
            if (updateTag) {
                updateLog += "[出入库重量](" + record.getRecordWeight() + ")修改为(" + updateData.getRecordWeight() + "),";
            }
        }

        //登记时间
        if(null != updateData.getRegisterTime() && null != record.getRegisterTime()){
        if (null != updateData.getRegisterTime() && null != record.getRegisterTime()) {
            updateTag = !updateData.getRegisterTime().equals(record.getRegisterTime());
            if(updateTag){
                remarks += "[登记时间](" + DateFormatUtils.format(record.getRegisterTime(),"yyyy-MM-dd HH:mm:ss") + ")修改为(" + DateFormatUtils.format(updateData.getRegisterTime(),"yyyy-MM-dd HH:mm:ss") + "),";
            if (updateTag) {
                updateLog += "[登记时间](" + DateFormatUtils.format(record.getRegisterTime(), "yyyy-MM-dd HH:mm:ss") + ")修改为(" + DateFormatUtils.format(updateData.getRegisterTime(), "yyyy-MM-dd HH:mm:ss") + "),";
            }
        }

        //满车时间
        if(null != updateData.getFullWeightTime() && null != record.getFullWeightTime()){
        if (null != updateData.getFullWeightTime() && null != record.getFullWeightTime()) {
            updateTag = !updateData.getFullWeightTime().equals(record.getFullWeightTime());
            if(updateTag){
                remarks += "[满车时间](" + DateFormatUtils.format(record.getFullWeightTime(),"yyyy-MM-dd HH:mm:ss") + ")修改为(" + DateFormatUtils.format(updateData.getFullWeightTime(),"yyyy-MM-dd HH:mm:ss") + "),";
            if (updateTag) {
                updateLog += "[满车时间](" + DateFormatUtils.format(record.getFullWeightTime(), "yyyy-MM-dd HH:mm:ss") + ")修改为(" + DateFormatUtils.format(updateData.getFullWeightTime(), "yyyy-MM-dd HH:mm:ss") + "),";
            }
        }

        //空车时间
        if(null != updateData.getEmptyWeightTime() && null != record.getEmptyWeightTime()){
        if (null != updateData.getEmptyWeightTime() && null != record.getEmptyWeightTime()) {
            updateTag = !updateData.getEmptyWeightTime().equals(record.getEmptyWeightTime());
            if(updateTag){
                remarks += "[空车时间](" + DateFormatUtils.format(record.getEmptyWeightTime(),"yyyy-MM-dd HH:mm:ss") + ")修改为(" + DateFormatUtils.format(updateData.getEmptyWeightTime(),"yyyy-MM-dd HH:mm:ss") + "),";
            if (updateTag) {
                updateLog += "[空车时间](" + DateFormatUtils.format(record.getEmptyWeightTime(), "yyyy-MM-dd HH:mm:ss") + ")修改为(" + DateFormatUtils.format(updateData.getEmptyWeightTime(), "yyyy-MM-dd HH:mm:ss") + "),";
            }
        }

        //完成时间
        if(null != updateData.getCompleteTime() && null != record.getCompleteTime()){
        if (null != updateData.getCompleteTime() && null != record.getCompleteTime()) {
            updateTag = !updateData.getCompleteTime().equals(record.getCompleteTime());
            if(updateTag){
                remarks += "[完成时间](" + DateFormatUtils.format(record.getCompleteTime(),"yyyy-MM-dd HH:mm:ss") + ")修改为(" + DateFormatUtils.format(updateData.getCompleteTime(),"yyyy-MM-dd HH:mm:ss") + "),";
            if (updateTag) {
                updateLog += "[完成时间](" + DateFormatUtils.format(record.getCompleteTime(), "yyyy-MM-dd HH:mm:ss") + ")修改为(" + DateFormatUtils.format(updateData.getCompleteTime(), "yyyy-MM-dd HH:mm:ss") + "),";
            }
        }

        //满车称重人
        if(null != updateData.getFullWeightUser() && null != record.getFullWeightUser()){
        if (null != updateData.getFullWeightUser() && null != record.getFullWeightUser()) {
            updateTag = !updateData.getFullWeightUser().equals(record.getFullWeightUser());
            if(updateTag){
                remarks += "[满车称重人](" + record.getFullWeightUser() + ")修改为(" + updateData.getFullWeightUser() + "),";
            if (updateTag) {
                updateLog += "[满车称重人](" + record.getFullWeightUser() + ")修改为(" + updateData.getFullWeightUser() + "),";
            }
        }

        //空车称重人
        if(null != updateData.getEmptyWeightUser() && null != record.getEmptyWeightUser()){
        if (null != updateData.getEmptyWeightUser() && null != record.getEmptyWeightUser()) {
            updateTag = !updateData.getEmptyWeightUser().equals(record.getEmptyWeightUser());
            if(updateTag){
                remarks += "[空车称重人](" + record.getEmptyWeightUser() + ")修改为(" + updateData.getEmptyWeightUser() + "),";
            if (updateTag) {
                updateLog += "[空车称重人](" + record.getEmptyWeightUser() + ")修改为(" + updateData.getEmptyWeightUser() + "),";
            }
        }

        //备注说明
        if(null != updateData.getRemarks() && null != record.getRemarks()){
        if (null != updateData.getRemarks() && null != record.getRemarks()) {
            updateTag = !updateData.getRemarks().equals(record.getRemarks());
            if(updateTag){
                remarks += "[备注说明](" + record.getRemarks() + ")修改为(" + updateData.getRemarks() + "),";
            if (updateTag) {
                updateLog += "[备注说明](" + record.getRemarks() + ")修改为(" + updateData.getRemarks() + "),";
            }
        }

        if(StringUtils.isNotBlank(record.getRemarks())){
            remarks = record.getRemarks() + ";" + remarks;
        if (StringUtils.isBlank(updateLog)) {
            return record.getUpdateLog() == null ? "" : record.getUpdateLog();
        }

        return remarks;
        updateLog0 = updateLog0 + updateLog;

        return record.getUpdateLog() == null ? updateLog0 : (record.getUpdateLog() + "；" + updateLog0);
    }

    /**
@@ -681,7 +688,7 @@
    public String inWeightBill(InoutRecord data) {

        // 获取表单数据
        InoutPrintBill bill = this.createBillData(data, "入库划码单");
        InoutPrintBill bill = this.createBillData(data, "-入库单");

        // 调整模版数据并返回
        String htmlStr = InoutBill.IN_WEIGHT_DEFAULT;
@@ -763,7 +770,7 @@
     */
    public String outWeightBill(InoutRecord data) {
        // 获取表单数据
        InoutPrintBill bill = this.createBillData(data, "出库划码单");
        InoutPrintBill bill = this.createBillData(data, "-出库单");

        //默认模版
        String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT;

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

@@ -123,7 +123,7 @@
      </PropertyDef>
      <PropertyDef name="settleWeight">
        <Property name="dataType">Double</Property>
        <Property name="label">结算净重</Property>
        <Property name="label">结算重量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">0.0 KG</Property>
      </PropertyDef>
@@ -156,6 +156,10 @@
      <PropertyDef name="remarks">
        <Property></Property>
        <Property name="label">备注信息</Property>
      </PropertyDef>
      <PropertyDef name="updateLog">
        <Property></Property>
          <Property name="label">修改记录</Property>
      </PropertyDef>
      <PropertyDef name="deptId">
        <Property></Property>
@@ -952,6 +956,12 @@
                <Property name="property">remarks</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:3">
                <Property name="name">updateLog</Property>
                <Property name="property">updateLog</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>

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

@@ -228,7 +228,7 @@
        <Button>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
                        if(data){&#xD;
                        view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data.toJSON()).flushAsync();&#xD;
                        view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();&#xD;
                        }else{&#xD;
                        view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
                        }</ClientEvent>

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

@@ -136,8 +136,9 @@
            sheetName = "入库报表数据";
            list = reportInoutPR.listRecord(param);
            List<InoutRecordInExport> exportList = new ArrayList<>();
            InoutRecordInExport export;
            for (InoutRecord record : list) {
                InoutRecordInExport export = new InoutRecordInExport();
                export = new InoutRecordInExport();
                export.setId(record.getId());
                export.setPlateNum(record.getPlateNum());
                // 将仓库ID映射为仓库名称
@@ -153,6 +154,7 @@
                export.setRecordWeight(record.getRecordWeight());
                export.setCompleteTime(record.getCompleteTime());
                export.setDeOther(record.getDeOther());
                export.setUpdateLog(record.getUpdateLog());
                exportList.add(export);
            }
            ExcelUtil<InoutRecordInExport> util = new ExcelUtil<InoutRecordInExport>(InoutRecordInExport.class);
@@ -163,8 +165,9 @@
            sheetName = "出库报表数据";
            list = reportInoutPR.listRecord(param);
            List<InoutRecordOutExport> exportList = new ArrayList<>();
            InoutRecordOutExport export;
            for (InoutRecord record : list) {
                InoutRecordOutExport export = new InoutRecordOutExport();
                export = new InoutRecordOutExport();
                export.setId(record.getId());
                export.setPlateNum(record.getPlateNum());
                // 将仓库ID映射为仓库名称
@@ -180,6 +183,7 @@
                export.setRecordWeight(record.getRecordWeight());
                export.setCompleteTime(record.getCompleteTime());
                export.setDeOther(record.getDeOther());
                export.setUpdateLog(record.getUpdateLog());
                exportList.add(export);
            }
            ExcelUtil<InoutRecordOutExport> util = new ExcelUtil<InoutRecordOutExport>(InoutRecordOutExport.class);
@@ -190,8 +194,9 @@
            sheetName = "入库明细报表数据";
            list = reportInoutPR.listRecord(param);
            List<InoutRecordDetailInExport> exportList = new ArrayList<>();
            InoutRecordDetailInExport export;
            for (InoutRecord record : list) {
                InoutRecordDetailInExport export = new InoutRecordDetailInExport();
                export = new InoutRecordDetailInExport();
                //收储公司映射
                String companyNameValue = companyMap.get(record.getCompanyId());
                export.setCompanyId(companyNameValue != null ? companyNameValue : "");
@@ -209,6 +214,7 @@
                export.setSettleWeight(record.getSettleWeight());
                export.setRecordWeight(record.getRecordWeight());
                export.setCompleteTime(record.getCompleteTime());
                export.setUpdateLog(record.getUpdateLog());
                exportList.add(export);
            }
            ExcelUtil<InoutRecordDetailInExport> util = new ExcelUtil<InoutRecordDetailInExport>(InoutRecordDetailInExport.class);
@@ -219,8 +225,9 @@
            sheetName = "出库明细报表数据";
            list = reportInoutPR.listRecord(param);
            List<InoutRecordDetailOutExport> exportList = new ArrayList<>();
            InoutRecordDetailOutExport export;
            for (InoutRecord record : list) {
                InoutRecordDetailOutExport export = new InoutRecordDetailOutExport();
                export = new InoutRecordDetailOutExport();
                //收储公司映射
                String companyNameValue = companyMap.get(record.getCompanyId());
                export.setCompanyId(companyNameValue != null ? companyNameValue : "");
@@ -238,6 +245,7 @@
                export.setSettleWeight(record.getSettleWeight());
                export.setRecordWeight(record.getRecordWeight());
                export.setCompleteTime(record.getCompleteTime());
                export.setUpdateLog(record.getUpdateLog());
                exportList.add(export);
            }
            ExcelUtil<InoutRecordDetailOutExport> util = new ExcelUtil<InoutRecordDetailOutExport>(InoutRecordDetailOutExport.class);

 fzzy-igdss-web/src/main/resources/templates/inout/handle.html

@@ -399,22 +399,13 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                            <div class="layui-col-xs4  display-none">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">入库重量</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="recordWeight" placeholder="自动计算，不可编辑"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs8">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">备注说明</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="remarks" placeholder="请输入内容"
                                               class="layui-input">
                                    </div>
                                </div>
                            </div>
@@ -425,6 +416,15 @@
                                        <input type="text" name="settleWeight" placeholder="自动计算，不可编辑"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs12">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">备注说明</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="remarks" placeholder="请输入内容"
                                               class="layui-input">
                                    </div>
                                </div>
                            </div>
@@ -576,6 +576,12 @@

</body>

<!-- 弹出通知单 -->
<div class="layui-tab-content" id="listNotice" style="display: none;">
    <table class="layui-table" lay-skin="nob" id="tableNotice"
           lay-filter="tableNotice" style="margin: 0px;"></table>
</div>

<!-- 弹出粮食产地 -->
<div class="layui-tab-content" id="listFoodLocation" style="display: none;">
    <table class="layui-table" lay-skin="nob" id="tableFoodLoaction"

 fzzy-igdss-web/src/main/resources/templates/inout/weight.html

@@ -487,22 +487,13 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                            <div class="layui-col-xs4 display-none">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">入库重量</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="recordWeight" placeholder="自动计算，不可编辑"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs8">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">备注说明</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="remarks" placeholder="请输入内容"
                                               class="layui-input">
                                    </div>
                                </div>
                            </div>
@@ -516,7 +507,15 @@
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs12">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">备注说明</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="remarks" placeholder="请输入内容"
                                               class="layui-input">
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs12">
                                <div class="line-container" style="margin: 10px 0 0 0;">
                                    <div class="line"></div>

 fzzy-igdss-web/src/main/resources/templates/inout/weight2.html

@@ -694,22 +694,13 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                            <div class="layui-col-xs4 display-none">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">入库重量</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="recordWeight" placeholder="自动计算，不可编辑"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs8">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">备注说明</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="remarks" placeholder="请输入内容"
                                               class="layui-input">
                                    </div>
                                </div>
                            </div>
@@ -723,7 +714,15 @@
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs12">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">备注说明</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="remarks" placeholder="请输入内容"
                                               class="layui-input">
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs12">
                                <div class="line-container" id="text-info">
                                    <div class="line"></div>