调整通知单

jiazx0107

2025-11-30 87e5654c26476fabd1156023350d7726092af8c1

调整通知单

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

@@ -46,9 +46,9 @@
    @TableField("type")
    private String type;

    @Column(name = "contract_id", columnDefinition = "varchar(40) COMMENT '所属合同'")
    @TableField("contract_id")
    private String contractId;
    @Column(name = "contract", columnDefinition = "varchar(40) COMMENT '所属合同'")
    @TableField("contract")
    private String contract;

    @Column(name = "depot_id", columnDefinition = "varchar(40) COMMENT '入库仓库'")
    @TableField("depot_id")
@@ -66,7 +66,7 @@
    @TableField("food_variety")
    private String foodVariety;

    @Column(name = "year", columnDefinition = "varchar(4) COMMENT '年份'")
    @Column(name = "year", columnDefinition = "varchar(4) COMMENT '粮食年份'")
    @TableField("year")
    private String year;

@@ -103,10 +103,5 @@
    @Column(name = "remark", columnDefinition = "varchar(100) COMMENT '备注说明'")
    @TableField("remark")
    private String remark;


    @Transient
    @PropertyDef(label = "标记", description = "用于判断通知单是否为新增")
    private String tag;

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeInMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.InoutNoticeIn;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface InoutNoticeInMapper extends BaseMapper<InoutNoticeIn> {

}

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

@@ -1,8 +1,10 @@
package com.fzzy.igds.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.NoticeDto;
import com.fzzy.igds.data.NoticeParam;
import com.fzzy.igds.mapper.InoutNoticeInMapper;
import com.fzzy.igds.mapper.InoutNoticeMapper;
import com.fzzy.igds.repository.InoutNoticeInRepository;
import com.fzzy.igds.repository.InoutNoticeOutRepository;
@@ -12,14 +14,17 @@
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.data.domain.Page;

import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

/**
 * @Description å‡ºå…¥åº“通知单service层，包含入库通知单和出库通知单
@@ -37,15 +42,27 @@
    @Resource
    private InoutNoticeMapper noticeMapper;

    /**
    @Resource
    private InoutNoticeInMapper noticeInMapper;


/*    *//**
     * JPA分页查询数据
     *
     * @param specification
     * @param pageable
     * @return
     */
     *//*
    public Page<InoutNoticeIn> queryAllNoticeIn(Specification<InoutNoticeIn> specification, Pageable pageable) {
        return noticeInRepository.findAll(specification, pageable);
    }*/

    public void pageQueryIn(Page<InoutNoticeIn> page, NoticeParam param) {
        QueryWrapper<InoutNoticeIn> queryWrapper = new QueryWrapper<>();

        if(null == param) param = new NoticeParam();
        param.setCompanyId(ContextUtil.getCompanyId());

        queryWrapper.eq("company_id", param.getCompanyId());

        noticeInMapper.selectPage(page, queryWrapper);
    }

    /**
@@ -77,15 +94,20 @@
     * @return
     */
    public String saveOrUpdateIn(InoutNoticeIn data) {
        if (Constant.YN_Y.equals(data.getTag())) {
        if (null == data.getUpdateBy()) {
            data.setUpdateBy(ContextUtil.getLoginUserName());
            data.setUpdateTime(new Date());
            data.setCreateBy(ContextUtil.getLoginUserName());
            data.setCreateTime(new Date());
            data.setAuditStatus(Constant.COMPLETE_STATUS_NONE);
            data.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
            noticeInRepository.save(data);
        } else {
            data.setUpdateBy(ContextUtil.getLoginUserName());
            data.setUpdateTime(new Date());
            noticeInRepository.save(data);
        }
        data.setUpdateBy(ContextUtil.getLoginUserName());
        data.setUpdateTime(new Date());
        noticeInRepository.save(data);

        return null;
    }

@@ -108,7 +130,8 @@
     * @return
     */
    public Page<InoutNoticeOut> queryAllNoticeOut(Specification<InoutNoticeOut> specification, Pageable pageable) {
        return noticeOutRepository.findAll(specification, pageable);
        //return noticeOutRepository.findAll(specification, pageable);
        return null;
    }

    /**
@@ -285,4 +308,5 @@
        return null;
    }


}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java

@@ -22,6 +22,7 @@
    private static final AtomicLong sequence = new AtomicLong(0);
    private static String lastTimestamp = "";


    //全局用户实时坐在部门
    public static Map<String, String> contextUserDept = new HashMap<>();

@@ -30,13 +31,33 @@
     */
    public static Map<String, String> contextSnCompanyIdMap = new HashMap<>();


    /**
     * ç”Ÿæˆé¡ºåºID：年月日时分秒毫秒(17位) + åºåˆ—号(4位) = 21位
     */
    public static String generateId() {
        String pattern = "yyyyMMddHHmmssSSS";
        return generateId(null, pattern);
    }

    /**
     * ç”Ÿæˆå•æ®ç¼–码， (格式: yyyyMMddHHmmss + 4位随机数)
     * @param prefix
     * @return
     */
    public static String generateOrderId(String prefix) {
        String pattern = "yyyyMMddHHmmss";
        return generateId(prefix, pattern);
    }

    /**
     *
     *
     * @return
     */
    public static String generateId() {
        String currentTimestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
    private static String generateId(String prefix, String pattern) {
        if (null == pattern) pattern = "yyyyMMddHHmmss";
        String currentTimestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern(pattern));
        long seq;
        synchronized (ContextUtil.class) {
            if (currentTimestamp.equals(lastTimestamp)) {
@@ -44,12 +65,14 @@
            } else {
                sequence.set(0);
                seq = 0;

                lastTimestamp = currentTimestamp;
            }
        }
        return String.format("%s%04d", currentTimestamp, seq);

        if (null == prefix) return String.format("%s%04d", currentTimestamp, seq);
        return prefix + "_" + String.format("%s%04d", currentTimestamp, seq);
    }


    public static String UUID() {
        return UUID.randomUUID().toString().replaceAll("-", "");
@@ -63,7 +86,7 @@
    public static String getCompanyId() {

        SysUser user = ShiroUtils.getSysUser();
        if(null != user) return user.getCompanyId();
        if (null != user) return user.getCompanyId();
        return FrameworkConfig.getCompanyId();
    }

@@ -113,16 +136,16 @@
        Integer index5 = 100001;
        Integer index = 0;
        String orderId = "001";
        if(StringUtils.isNotEmpty(oldOrderId)){
        if (StringUtils.isNotEmpty(oldOrderId)) {
            index = Integer.valueOf(oldOrderId);
        }
        if(3 == num){
        if (3 == num) {
            orderId = ((index3 + index) + "").substring(1);
        }
        if(4 == num){
        if (4 == num) {
            orderId = ((index4 + index) + "").substring(1);
        }
        if(5 == num){
        if (5 == num) {
            orderId = ((index5 + index) + "").substring(1);
        }
        return orderId;

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

@@ -7,7 +7,7 @@
      <Property name="creationType">com.fzzy.igds.domain.InoutNoticeIn</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">通知单号</Property>
        <Property name="label">单据号</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property></Property>
@@ -16,29 +16,24 @@
      <PropertyDef name="deptId">
        <Property></Property>
        <Property name="label">所属分库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">kqmc</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="name">
        <Property></Property>
        <Property name="label">通知单名称</Property>
        <Property name="label">单据名称</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="type">
        <Property></Property>
        <Property name="label">类型</Property>
        <Property name="label">单据类型</Property>
        <Property name="mapping">
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="name">库区自建</Property>
                <Property name="name">库区通知单</Property>
                <Property name="code">10</Property>
              </Entity>
              <Entity>
                <Property name="name">银行监管</Property>
                <Property name="name">监管通知单</Property>
                <Property name="code">20</Property>
              </Entity>
            </Collection>
@@ -46,10 +41,11 @@
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="contractId">
      <PropertyDef name="contract">
        <Property></Property>
        <Property name="label">质押合同</Property>
        <Property name="label">关联合同</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="depotId">
@@ -89,13 +85,12 @@
      <PropertyDef name="year">
        <Property></Property>
        <Property name="label">年份</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="targetNumber">
        <Property name="dataType">Double</Property>
        <Property name="displayFormat">#0.0 KG</Property>
        <Property name="required">true</Property>
        <Property name="label">目标数量</Property>
        <Property name="label">计划数量</Property>
      </PropertyDef>
      <PropertyDef name="completeNumber">
        <Property name="dataType">Double</Property>
@@ -155,7 +150,7 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="completeTime">
        <Property name="dataType">DateTime</Property>
        <Property name="dataType">Date</Property>
        <Property name="label">完成时间</Property>
      </PropertyDef>
      <PropertyDef name="remark">
@@ -168,72 +163,19 @@
      </PropertyDef>
      <PropertyDef name="createTime">
        <Property name="dataType">DateTime</Property>
        <Property name="label">创建时间</Property>
        <Property name="readOnly">true</Property>
        <Property name="label">制单时间</Property>
      </PropertyDef>
      <PropertyDef name="createBy">
        <Property></Property>
        <Property name="label">创建人</Property>
        <Property name="readOnly">true</Property>
        <Property name="label">制单人</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">DateTime</Property>
        <Property name="label">更新时间</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="updateBy">
        <Property></Property>
        <Property name="label">更新人</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtQuery">
      <PropertyDef name="depotId">
        <Property></Property>
        <Property name="label">装卸仓库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="customerName">
        <Property></Property>
        <Property name="label">发货客户</Property>
      </PropertyDef>
      <PropertyDef name="foodVariety">
        <Property></Property>
        <Property name="label">粮食品种</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#sysDictData&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
          <Property name="keyProperty">dictValue</Property>
          <Property name="valueProperty">dictLabel</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="completeStatus">
        <Property></Property>
        <Property name="label">完成状态</Property>
        <Property name="mapping">
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="name">未完成</Property>
                <Property name="code">NONE</Property>
              </Entity>
              <Entity>
                <Property name="name">已完成</Property>
                <Property name="code">COMPLETE</Property>
              </Entity>
            </Collection>
          </Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtQueryTitle">
      <PropertyDef name="title">
        <Property name="label">title</Property>
      </PropertyDef>
    </DataType>
  </Model>
@@ -245,14 +187,9 @@
};&#xD;
query();&#xD;
      &#xD;
queryTitle = function(){&#xD;
    view.get(&quot;#dsQueryTitle&quot;).set(&quot;parameter&quot;,{type:TYPE,deptId:deptId}).flushAsync();&#xD;
};&#xD;
queryTitle();&#xD;
      &#xD;
//新增&#xD;
add = function(){&#xD;
    view.get(&quot;#ajaxInitAdd&quot;).set(&quot;parameter&quot;, TYPE).execute(function(data){&#xD;
    view.get(&quot;#ajaxInitAdd&quot;).execute(function(data){&#xD;
        view.get(&quot;#dsMain&quot;).insert(data);&#xD;
        view.get(&quot;#dialogMain&quot;).show();&#xD;
    });&#xD;
@@ -265,14 +202,9 @@
      <Property name="loadMode">lazy</Property>
    </DataSet>
    <DataSet id="dsQuery">
      <Property name="dataType">dtQuery</Property>
      <Property name="dataProvider">inoutNoticePR#getYearQuery</Property>
      <Property name="loadMode">manual</Property>
    </DataSet>
    <DataSet id="dsQueryTitle">
      <Property name="dataType">dtQueryTitle</Property>
      <Property name="dataProvider">inoutNoticePR#getTitle</Property>
      <Property name="loadMode">manual</Property>
      <Property name="dataType">dtNoticeParam</Property>
    </DataSet>
    <Container>
      <Property name="className">c-param</Property>
@@ -310,7 +242,7 @@
            }</ClientEvent>
          <Property name="caption">搜索</Property>
          <Property name="iconClass">fa fa-search</Property>
          <Property name="exClassName">btn-q1</Property>>
          <Property name="exClassName">btn-q1</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#dsQuery&quot;).flushAsync();</ClientEvent>
@@ -443,34 +375,29 @@
          <Property name="width">160</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Container layoutConstraint="bottom">
      <Property name="className">c-bottom</Property>
      <DataPilot layoutConstraint="right">
        <Property name="itemCodes">pageSize,pages</Property>
        <Property name="dataSet">dsMain</Property>
      </DataPilot>
      <ToolBar layoutConstraint="bottom">
        <Fill/>
        <DataPilot layoutConstraint="right">
          <Property name="itemCodes">pageSize,pages</Property>
          <Property name="dataSet">dsMain</Property>
        </DataPilot>
      </ToolBar>
    </Container>
    <Dialog id="dialogMain" layout="regionPadding:8">
      <Property name="closeable">false</Property>
      <Property name="caption">入库通知单</Property>
      <Property name="width">60%</Property>
      <Property name="width">1200</Property>
      <Property name="iconClass">fa fa-tasks</Property>
      <Buttons>
        <Button id="btnOk">
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
            if(data.validate() != 'ok'){&#xD;
            $notify(&quot;数据校验失败！！&quot;);&#xD;
            return;&#xD;
            }&#xD;
            view.get(&quot;#ajaxSave&quot;).set(&quot;parameter&quot;,data).execute(function(result){&#xD;
            if(result){&#xD;
            $alert(result);&#xD;
            return;&#xD;
            }&#xD;
            $notify(&quot;数据执行完成！！&quot;);&#xD;
            self.get(&quot;parent&quot;).hide();&#xD;
            });</ClientEvent>
          <ClientEvent name="onClick">view.get(&quot;#udpateSave&quot;).execute(function(result){&#xD;
    if(result){&#xD;
        $alert(result);&#xD;
        return;&#xD;
    }&#xD;
    $notify(&quot;数据执行完成！！&quot;);&#xD;
    self.get(&quot;parent&quot;).hide();&#xD;
});</ClientEvent>
          <Property name="caption">保存</Property>
          <Property name="iconClass">fa fa-check-circle</Property>
          <Property name="exClassName">btn1</Property>
@@ -487,134 +414,148 @@
      </Buttons>
      <Children>
        <Container>
          <AutoForm id="autoForm1" layoutConstraint="top padding:10">
            <Property name="cols">*,*,*,*,*,*,*</Property>
            <Property name="dataSet">dsQueryTitle</Property>
            <Property name="labelAlign">right</Property>
          <AutoForm layoutConstraint="top ">
            <Property name="dataSet">dsMain</Property>
            <Property name="showHint">false</Property>
            <AutoFormElement layoutConstraint="colSpan:7">
              <Property name="name">title</Property>
              <Property name="property">title</Property>
              <Property name="showLabel">false</Property>
            <Property name="cols">210,*,210</Property>
            <Control/>
            <AutoFormElement>
              <Property name="name">name</Property>
              <Property name="property">name</Property>
              <Property name="editorType">Label</Property>
              <Property name="style">
                <Property name="font">bold 30px Georgia, serif;</Property>
                <Property name="text-align">center</Property>
              </Property>
              <Property name="showLabel">false</Property>
              <Property name="showHint">false</Property>
              <Property name="className">f-title</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">id</Property>
              <Property name="property">id</Property>
              <Property name="editorType">Label</Property>
              <Property name="showHint">false</Property>
              <Property name="labelAlign">right</Property>
              <Property name="showLabel">false</Property>
              <Editor/>
            </AutoFormElement>
          </AutoForm>
          <Container layout="padding:15">
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="cols">*,*,*</Property>
              <Property name="labelAlign">right</Property>
              <Property name="labelSeparator">：</Property>
              <Property name="labelWidth">120</Property>
              <AutoFormElement>
                <Property name="name">name</Property>
                <Property name="property">name</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">depotId</Property>
                <Property name="property">depotId</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">id</Property>
                <Property name="property">id</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">foodVariety</Property>
                <Property name="property">foodVariety</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">customerName</Property>
                <Property name="property">customerName</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">unitName</Property>
                <Property name="property">unitName</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">year</Property>
                <Property name="property">year</Property>
                <Property name="trigger">defaultYearDropDown</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">targetNumber</Property>
                <Property name="property">targetNumber</Property>
                <Property name="readOnly">false</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">completeNumber</Property>
                <Property name="property">completeNumber</Property>
                <Property name="readOnly">false</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">type</Property>
                <Property name="property">type</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">completeStatus</Property>
                <Property name="property">completeStatus</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">completeTime</Property>
                <Property name="property">completeTime</Property>
                <Property name="readOnly">false</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">contractId</Property>
                <Property name="property">contractId</Property>
                <Editor/>
              </AutoFormElement>
              <Label layoutConstraint="colSpan:2">
                <Property name="style">
                  <Property name="color">blue</Property>
                </Property>
                <Property name="text">注：类型为银行监管时，需关联质押合同</Property>
              </Label>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">remark</Property>
                <Property name="property">remark</Property>
                <Property name="editorType">TextArea</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">createBy</Property>
                <Property name="property">createBy</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">createTime</Property>
                <Property name="property">createTime</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">updateBy</Property>
                <Property name="property">updateBy</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">updateTime</Property>
                <Property name="property">updateTime</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Container>
          <AutoForm>
            <Property name="dataSet">dsMain</Property>
            <Property name="cols">*,*,*</Property>
            <Property name="labelAlign">right</Property>
            <Property name="labelSeparator">：</Property>
            <Property name="labelWidth">120</Property>
            <AutoFormElement layoutConstraint="colSpan:2">
              <Property name="name">name</Property>
              <Property name="property">name</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">type</Property>
              <Property name="property">type</Property>
              <Property name="editorType">RadioGroup</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">depotId</Property>
              <Property name="property">depotId</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">foodVariety</Property>
              <Property name="property">foodVariety</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">year</Property>
              <Property name="property">year</Property>
              <Property name="trigger">defaultYearDropDown</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement layoutConstraint="colSpan:2">
              <Property name="name">customerName</Property>
              <Property name="property">customerName</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">unitName</Property>
              <Property name="property">unitName</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">targetNumber</Property>
              <Property name="property">targetNumber</Property>
              <Property name="readOnly">false</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">completeNumber</Property>
              <Property name="property">completeNumber</Property>
              <Property name="readOnly">false</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">completeStatus</Property>
              <Property name="property">completeStatus</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">completeTime</Property>
              <Property name="property">completeTime</Property>
              <Property name="readOnly">false</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">createBy</Property>
              <Property name="property">createBy</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">auditStatus</Property>
              <Property name="property">auditStatus</Property>
              <Property name="readOnly">true</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement layoutConstraint="colSpan:2">
              <Property name="name">contract</Property>
              <Property name="property">contract</Property>
              <Editor/>
            </AutoFormElement>
            <Label>
              <Property name="style">
                <Property name="color">blue</Property>
              </Property>
              <Property name="text">注：监管通知单，可填写质押合同名称</Property>
            </Label>
            <AutoFormElement layoutConstraint="colSpan:3">
              <Property name="name">remark</Property>
              <Property name="property">remark</Property>
              <Property name="editorType">TextArea</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">createTime</Property>
              <Property name="property">createTime</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">auditUser</Property>
              <Property name="property">auditUser</Property>
              <Property name="readOnly">true</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">auditDate</Property>
              <Property name="property">auditDate</Property>
              <Property name="readOnly">true</Property>
              <Editor/>
            </AutoFormElement>
            <HtmlContainer layoutConstraint="colSpan:3">
              <Property name="content">1.入库通知单作为入库作业的前置条件，必须配置，否则无法进行入库作业。&lt;br>&#xD;
2.单据类型=库区通知单，表示库区自己作业业务，不受监管管理。</Property>
              <Property name="exClassName">h-tip</Property>
              <Property name="contentOverflow">hidden</Property>
            </HtmlContainer>
          </AutoForm>
        </Container>
      </Children>
      <Tools/>
@@ -622,6 +563,13 @@
    <AjaxAction id="ajaxSave">
      <Property name="service">inoutNoticePR#saveIn</Property>
    </AjaxAction>
    <UpdateAction id="udpateSave">
      <Property name="dataResolver">inoutNoticePR#saveIn</Property>
      <UpdateItem>
        <Property name="dataPath">[#current]</Property>
        <Property name="dataSet">dsMain</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxDel">
      <Property name="service">inoutNoticePR#delDataIn</Property>
      <Property name="confirmMessage">确定要执行删除么？</Property>

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

@@ -767,16 +767,10 @@
              <Property name="cols">*,*</Property>
              <Property name="labelAlign">right</Property>
              <Property name="labelSeparator">：</Property>
              <Property name="labelWidth">120</Property>
              <Property name="labelWidth">110</Property>
              <AutoFormElement>
                <Property name="name">name</Property>
                <Property name="property">name</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">id</Property>
                <Property name="property">id</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>

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

@@ -2,10 +2,12 @@


import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.NoticeDto;
import com.fzzy.igds.data.NoticeParam;
import com.fzzy.igds.service.InoutNoticeService;
import com.fzzy.igds.domain.InoutNoticeIn;
import com.fzzy.igds.domain.InoutNoticeOut;
@@ -41,12 +43,12 @@
    @Resource
    private SysDeptService sysDeptService;

    /**
/*    *//**
     * inoutNoticePR#getTitle æ ¹æ®æŠ¥è¡¨ç±»åž‹ï¼ŒèŽ·å–默认查询信息，比如表头信息等
     *
     * @param
     * @return
     */
     *//*
    @DataProvider
    public Map<String, Object> getTitle(Map<String, Object> param) {
        Map<String, Object> result = new HashMap<String, Object>();
@@ -72,7 +74,7 @@
            }
        }
        return result;
    }
    }*/

    /**
     * inoutNoticePR#getYearQuery é»˜è®¤å¹´ä»½
@@ -143,11 +145,13 @@
    public InoutNoticeIn initAddIn() {
        SysUser user = ContextUtil.getLoginUser();
        InoutNoticeIn data = new InoutNoticeIn();
        data.setId("RKTZD_" + ContextUtil.generateId());
        data.setId(ContextUtil.generateOrderId("RK"));
        data.setName("入库通知单");
        data.setCompanyId(user.getCompanyId());
        data.setDeptId(ContextUtil.subDeptId(user));
        data.setTag(Constant.YN_Y);
        data.setYear(DateFormatUtils.format(new Date(), "yyyy"));
        data.setCreateBy(ContextUtil.getLoginUserName());
        data.setCreateTime(new Date());
        return data;
    }

@@ -158,62 +162,20 @@
     * @return
     */
    @DataProvider
    public void pageQueryIn(Page<InoutNoticeIn> page, Map<String, Object> param) {
        if (null == param) {
            param = new HashMap<>();
        }
        Map<String, Object> finalParam = param;
    public void pageQueryIn(Page<InoutNoticeIn> page, NoticeParam param) {
        com.baomidou.mybatisplus.extension.plugins.pagination.Page<InoutNoticeIn> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());

        //多参数分页查询
        Pageable pageable = PageRequest.of(0, 10000, Sort.Direction.ASC, InoutNoticeIn.SORT_PROP);
        Specification<InoutNoticeIn> specification = new Specification<InoutNoticeIn>() {
            private static final long serialVersionUID = 1L;
        inoutNoticeService.pageQueryIn(corePage, param);

            public Predicate toPredicate(Root<InoutNoticeIn> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
                List<Predicate> predicates = new ArrayList<Predicate>(); //所有的断言

                Predicate predicate1 = cb.equal(root.get("companyId"), ContextUtil.getCompanyId());
                predicates.add(predicate1);
                Predicate predicate2 = cb.equal(root.get("deptId"), ContextUtil.subDeptId(null));
                predicates.add(predicate2);

                String key = String.valueOf(finalParam.get("year"));
                if (StringUtils.isBlank(key)) {
                    Predicate predicate3 = cb.equal(root.get("year"), key);
                    predicates.add(predicate3);
                }
                key = (String) finalParam.get("id");
                if (StringUtils.isBlank(key)) {
                    Predicate predicate4 = cb.equal(root.get("id"),  key);
                    predicates.add(predicate4);
                }
                key = (String) finalParam.get("customerName");
                if (StringUtils.isBlank(key)) {
                    Predicate predicate5 = cb.like(root.get("customerName"), "%" + key + "%");
                    predicates.add(predicate5);
                }
                key = (String) finalParam.get("completeStatus");
                if (StringUtils.isBlank(key)) {
                    Predicate predicate6 = cb.equal(root.get("completeStatus"), key);
                    predicates.add(predicate6);
                }
                key = (String) finalParam.get("foodVariety");
                if (StringUtils.isBlank(key)) {
                    Predicate predicate7 = cb.equal(root.get("foodVariety"), key);
                    predicates.add(predicate7);
                }
                return cb.and(predicates.toArray(new Predicate[0]));
            }
        };
        org.springframework.data.domain.Page<InoutNoticeIn> japPage = inoutNoticeService.queryAllNoticeIn(specification, pageable);
        page.setEntityCount((int) japPage.getTotalElements());
        page.setEntities(japPage.getContent());
        // é‡æ–°å°è£…
        page.setEntities(corePage.getRecords());
        page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
    }

    /**
     * inoutNoticePR#saveIn æ›´æ–°å…¥åº“通知单
     */
    @Expose
    @DataResolver
    public String saveIn(InoutNoticeIn data) {
        InoutNoticeIn inoutNoticeIn = new InoutNoticeIn();
        BeanUtils.copyProperties(data, inoutNoticeIn);
@@ -279,9 +241,10 @@
                return cb.and(predicates.toArray(new Predicate[0]));
            }
        };
        org.springframework.data.domain.Page<InoutNoticeIn> japPage = inoutNoticeService.queryAllNoticeIn(specification, pageable);
        //org.springframework.data.domain.Page<InoutNoticeIn> japPage = inoutNoticeService.queryAllNoticeIn(specification, pageable);

        return japPage.getContent();
        //return japPage.getContent();
        return null;
    }

    /**
@@ -382,9 +345,9 @@
                return cb.and(predicates.toArray(new Predicate[0]));
            }
        };
        org.springframework.data.domain.Page<InoutNoticeOut> japPage = inoutNoticeService.queryAllNoticeOut(specification, pageable);
        page.setEntityCount((int) japPage.getTotalElements());
        page.setEntities(japPage.getContent());
        //org.springframework.data.domain.Page<InoutNoticeOut> japPage = inoutNoticeService.queryAllNoticeOut(specification, pageable);
        //page.setEntityCount((int) japPage.getTotalElements());
        //page.setEntities(japPage.getContent());
    }

    /**
@@ -458,9 +421,10 @@
                return cb.and(predicates.toArray(new Predicate[0]));
            }
        };
        org.springframework.data.domain.Page<InoutNoticeOut> japPage = inoutNoticeService.queryAllNoticeOut(specification, pageable);
        //org.springframework.data.domain.Page<InoutNoticeOut> japPage = inoutNoticeService.queryAllNoticeOut(specification, pageable);

        return japPage.getContent();
        //return japPage.getContent();
        return null;
    }

    /**

 fzzy-igdss-view/src/main/java/models/core.model.xml

@@ -3,14 +3,14 @@
  <DataType name="dtBank">
    <Property name="matchType">com.fzzy.igds.domain.Bank</Property>
    <PropertyDef name="id">
      <Property/>
      <Property></Property>
    </PropertyDef>
    <PropertyDef name="name">
      <Property/>
      <Property></Property>
      <Property name="label">银行名称</Property>
    </PropertyDef>
    <PropertyDef name="status">
      <Property/>
      <Property></Property>
      <Property name="label">是否启用</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerYN&quot;).getResult(&quot;DEVICE_STATUS&quot;)}</Property>
@@ -19,15 +19,15 @@
      </Property>
    </PropertyDef>
    <PropertyDef name="remark">
      <Property/>
      <Property></Property>
      <Property name="label">备注说明</Property>
    </PropertyDef>
    <PropertyDef name="companyId">
      <Property/>
      <Property></Property>
      <Property name="label">所属组织</Property>
    </PropertyDef>
    <PropertyDef name="createBy">
      <Property/>
      <Property></Property>
      <Property name="label">创建人</Property>
    </PropertyDef>
    <PropertyDef name="createTime">
@@ -35,7 +35,7 @@
      <Property name="label">创建时间</Property>
    </PropertyDef>
    <PropertyDef name="updateBy">
      <Property/>
      <Property></Property>
      <Property name="label">更新人</Property>
    </PropertyDef>
    <PropertyDef name="updateTime">
@@ -46,14 +46,14 @@
  <DataType name="dtBaseParam">
    <Property name="matchType">com.fzzy.igds.data.IgdsBaseParam</Property>
    <PropertyDef name="id">
      <Property/>
      <Property></Property>
    </PropertyDef>
    <PropertyDef name="name">
      <Property/>
      <Property></Property>
      <Property name="label">名称</Property>
    </PropertyDef>
    <PropertyDef name="key">
      <Property/>
      <Property></Property>
      <Property name="label">关键字</Property>
    </PropertyDef>
    <PropertyDef name="start">
@@ -911,4 +911,65 @@
      <Property name="readOnly">true</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtNoticeParam">
    <Property name="matchType">com.fzzy.igds.data.NoticeParam</Property>
    <PropertyDef name="id">
      <Property/>
    </PropertyDef>
    <PropertyDef name="companyId">
      <Property/>
    </PropertyDef>
    <PropertyDef name="depotId">
      <Property/>
    </PropertyDef>
    <PropertyDef name="deptId">
      <Property/>
      <Property name="label">装卸仓库</Property>
    </PropertyDef>
    <PropertyDef name="customerName">
      <Property/>
      <Property name="label">客户名称</Property>
    </PropertyDef>
    <PropertyDef name="foodVariety">
      <Property/>
      <Property name="label">粮食品种</Property>
    </PropertyDef>
    <PropertyDef name="contractId">
      <Property/>
    </PropertyDef>
    <PropertyDef name="planId">
      <Property/>
    </PropertyDef>
    <PropertyDef name="foodType">
      <Property/>
    </PropertyDef>
    <PropertyDef name="year">
      <Property/>
    </PropertyDef>
    <PropertyDef name="type">
      <Property/>
    </PropertyDef>
    <PropertyDef name="weight">
      <Property name="dataType">Double</Property>
    </PropertyDef>
    <PropertyDef name="taskNum">
      <Property name="dataType">Double</Property>
    </PropertyDef>
    <PropertyDef name="completeStatus">
      <Property/>
      <Property name="label">完成状态</Property>
    </PropertyDef>
    <PropertyDef name="storageReal">
      <Property name="dataType">Double</Property>
    </PropertyDef>
    <PropertyDef name="start">
      <Property name="dataType">Date</Property>
    </PropertyDef>
    <PropertyDef name="end">
      <Property name="dataType">Date</Property>
    </PropertyDef>
    <PropertyDef name="createUser">
      <Property/>
    </PropertyDef>
  </DataType>
</Model>

 fzzy-igdss-web/src/main/resources/d7/common.css

@@ -275,14 +275,22 @@

/**表单TITLE**/
.f-title{
    font-weight: bold;
    font: bold 30px Arial, sans-serif;
    text-align: center;
    font-size:22px;
}
.bar-title {
    font-weight: bold;
    font-family: "微软雅黑", Arial, sans-serif;
}
/**表单提示信息**/
.h-tip {
    display: block;
    color: #8a6d3b;
    background-color: #fcf8e3;
    border-color: #faebcc;
    padding: 15px;
    border-radius: 4px;
}

/**定制样式**/
#d_cddWarehouse.d-modern-scroller {