优化人员信息

CZT

2023-11-02 99f928a971a5d2c58d5fafb38728471a39b5a759

优化人员信息

 igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java

@@ -3,7 +3,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@@ -20,29 +19,17 @@

    private static final long serialVersionUID = 1L;
    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "ID")
    private String id;

    @Column(name = "kqdm", length = 40)
    @PropertyDef(label = "库区代码")
    private String kqdm;
    @Column(name = "sbbh", length = 20)
    @PropertyDef(label = "设备编号")
    private String sbbh;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码", description = "")
    private String companyId;

    @Column(name = "dwdm", length = 18)
    @PropertyDef(label = "单位代码")
    private String dwdm;

    @Column(name = "kqmc", length = 256)
    @PropertyDef(label = "库区名称")
    private String kqmc;

    @Column(name = "sbbh", length = 20)
    @PropertyDef(label = "设备编号")
    private String sbbh;
    @Column(name = "DEPT_ID_", length = 40)
    @PropertyDef(label = "所属库区")
    private String deptId;

    @Column(name = "sbyqmc", length = 50)
    @PropertyDef(label = "设备仪器名称")
@@ -75,7 +62,6 @@

    @Column(name = "jdsj")
    @PropertyDef(label = "检定时间")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date jdsj;

    @Column(name = "jddw", length = 256)
@@ -84,7 +70,6 @@

    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "更新时间")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date updateTime;
    
}

 igds-manager/src/main/java/com/ld/igds/models/OAStaff.java

@@ -25,30 +25,31 @@
@Table(name = "D_OA_STAFF")
public class OAStaff implements Serializable {
    private static final long serialVersionUID = 1L;

    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "ID")
    private String id;
    @Column(name = "sfzhm", length = 18)
    @PropertyDef(label = "身份证号码")
    private String sfzhm;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码", description = "")
    private String companyId;

    @Column(name = "dwdm", length = 18)
    @PropertyDef(label = "单位代码")
    private String dwdm;

    @Column(name = "dwmc", length = 256)
    @PropertyDef(label = "单位名称")
    private String dwmc;
    @Column(name = "DEPT_ID_", length = 20)
    @PropertyDef(label = "库区编码", description = "")
    private String deptId;

    @Column(name = "lsbm", length = 256)
    @PropertyDef(label = "隶属部门", description = "隶属部门名称")
    private String lsbm;

    @Column(name = "xzqhdm", length = 6)
    @PropertyDef(label = "行政区划代码")
    @PropertyDef(label = "所属行政区划")
    private String xzqhdm;

    @Column(name = "xzqhmc", length = 6)
    @PropertyDef(label = "所属行政区划")
    private String xzqhmc;

    @Column(name = "xm", length = 32)
    @PropertyDef(label = "姓名")
@@ -57,10 +58,6 @@
    @Column(name = "xb", length = 1)
    @PropertyDef(label = "性别")
    private String xb;

    @Column(name = "sfzhm", length = 18)
    @PropertyDef(label = "身份证号码")
    private String sfzhm;

    @Column(name = "rzrq")
    @PropertyDef(label = "入职日期")

 igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java

@@ -9,6 +9,7 @@
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -57,14 +58,12 @@
            if (null == data.getCompanyId()) {
                data.setCompanyId(ContextUtil.getCompanyId());
            }
            if (StringUtils.isEmpty(data.getKqdm())) {
                data.setKqdm(ContextUtil.subDeptId(null));
            if (StringUtils.isEmpty(data.getDeptId())) {
                data.setDeptId(ContextUtil.subDeptId(null));
            }
            DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(), data.getKqdm());
            data.setKqmc(dept.getName());
            data.setUpdateTime(new Date());
            if (null == data.getId()) {
                data.setId(ContextUtil.getUUID());
            if (null == data.getSbbh()) {
                data.setSbbh(DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
            }
            session.saveOrUpdate(data);
        } finally {
@@ -74,6 +73,39 @@
        return null;
    }

    public String getIndex(String companyId) {
        List<DeptDevice> list = getDataByTime(companyId);
        int index = 10000;
        if (list != null && list.size() > 0) {
            String id = list.get(0).getSbbh().substring(8);
            int temp = Integer.valueOf(id) + 1;
            index += temp;
        }else {
            index ++;
        }
        return String.valueOf(index).substring(1);
    }

    private List<DeptDevice> getDataByTime(String companyId) {
        String hql = " from " + DeptDevice.class.getName()
                + " where companyId =:companyId ";

        Map<String, Object> args = new HashMap<String, Object>();
        args.put("companyId", companyId);

        hql += " and updateTime >:startTime";
        args.put("startTime", DateUtil.getCurZero(new Date()));


        hql += " and updateTime <:endTime";
        args.put("endTime", DateUtil.getNextZero(new Date()));


        hql += " order by id desc";

        return this.query(hql, args);
    }

    public String delData(DeptDevice data) {
        Session session = this.getSessionFactory().openSession();
        try {

 igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java

@@ -68,13 +68,13 @@
    }

    public String saveOrUpdate(OAStaff data) {

        //判断组织编码
        if (StringUtils.isEmpty(data.getCompanyId())) {
            data.setCompanyId(data.getCompanyId());
        }
        Session session = this.getSessionFactory().openSession();
        try {
            data.setCompanyId(ContextUtil.getCompanyId());
            if (null == data.getId()) {
                data.setId(ContextUtil.getUUID());
            }
            session.saveOrUpdate(data);
        } finally {
            session.flush();

 igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml

@@ -5,21 +5,24 @@
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.ld.igds.models.OAStaff</Property>
      <PropertyDef name="id">
      <PropertyDef name="sfzhm">
        <Property></Property>
        <Property name="label">ID</Property>
        <Property name="label">身份证号码</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">组织编码</Property>
      </PropertyDef>
      <PropertyDef name="dwdm">
      <PropertyDef name="deptId">
        <Property></Property>
        <Property name="label">单位代码</Property>
      </PropertyDef>
      <PropertyDef name="dwmc">
        <Property></Property>
        <Property name="label">单位名称</Property>
        <Property name="label">所属库区</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="lsbm">
        <Property></Property>
@@ -28,7 +31,12 @@
      </PropertyDef>
      <PropertyDef name="xzqhdm">
        <Property></Property>
        <Property name="label">行政区划代码</Property>
        <Property name="label">所属行政区划</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="xzqhmc">
        <Property></Property>
        <Property name="label">所属行政区划</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="xm">
@@ -57,11 +65,6 @@
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="sfzhm">
        <Property></Property>
        <Property name="label">身份证号码</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="rzrq">
        <Property name="dataType">Date</Property>
        <Property name="label">入职日期</Property>
@@ -71,9 +74,24 @@
        <Property></Property>
        <Property name="label">岗位性质</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;GWXZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">11</Property>
                <Property name="value">11-在岗职工(长期)</Property>
              </Entity>
              <Entity>
                <Property name="key">12</Property>
                <Property name="value">12-在岗职工(临时)</Property>
              </Entity>
              <Entity>
                <Property name="key">20</Property>
                <Property name="value">20-其他从业人员</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
@@ -81,9 +99,20 @@
        <Property></Property>
        <Property name="label">在岗状态</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;ZGZT&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">01</Property>
                <Property name="value">01-在岗</Property>
              </Entity>
              <Entity>
                <Property name="key">02</Property>
                <Property name="value">02-已离职</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
@@ -108,9 +137,236 @@
        <Property></Property>
        <Property name="label">民族</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;MZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">01</Property>
                <Property name="value">01-汉族</Property>
              </Entity>
              <Entity>
                <Property name="key">02</Property>
                <Property name="value">02-蒙古族</Property>
              </Entity>
              <Entity>
                <Property name="key">03</Property>
                <Property name="value">03-回族</Property>
              </Entity>
              <Entity>
                <Property name="key">04</Property>
                <Property name="value">04-藏族</Property>
              </Entity>
              <Entity>
                <Property name="key">05</Property>
                <Property name="value">05-维吾尔族</Property>
              </Entity>
              <Entity>
                <Property name="key">06</Property>
                <Property name="value">06-苗族</Property>
              </Entity>
              <Entity>
                <Property name="key">07</Property>
                <Property name="value">07-彝族</Property>
              </Entity>
              <Entity>
                <Property name="key">08</Property>
                <Property name="value">08-壮族</Property>
              </Entity>
              <Entity>
                <Property name="key">09</Property>
                <Property name="value">09-布依族</Property>
              </Entity>
              <Entity>
                <Property name="key">10</Property>
                <Property name="value">10-朝鲜族</Property>
              </Entity>
              <Entity>
                <Property name="key">11</Property>
                <Property name="value">11-满族</Property>
              </Entity>
              <Entity>
                <Property name="key">12</Property>
                <Property name="value">12-侗族</Property>
              </Entity>
              <Entity>
                <Property name="key">13</Property>
                <Property name="value">13-瑶族</Property>
              </Entity>
              <Entity>
                <Property name="key">14</Property>
                <Property name="value">14-白族</Property>
              </Entity>
              <Entity>
                <Property name="key">15</Property>
                <Property name="value">15-土家族</Property>
              </Entity>
              <Entity>
                <Property name="key">16</Property>
                <Property name="value">16-哈尼族</Property>
              </Entity>
              <Entity>
                <Property name="key">17</Property>
                <Property name="value">17-哈萨克族</Property>
              </Entity>
              <Entity>
                <Property name="key">18</Property>
                <Property name="value">18-傣族</Property>
              </Entity>
              <Entity>
                <Property name="key">19</Property>
                <Property name="value">19-黎族</Property>
              </Entity>
              <Entity>
                <Property name="key">20</Property>
                <Property name="value">20-傈僳族</Property>
              </Entity>
              <Entity>
                <Property name="key">21</Property>
                <Property name="value">21-佤族</Property>
              </Entity>
              <Entity>
                <Property name="key">22</Property>
                <Property name="value">22-畲族</Property>
              </Entity>
              <Entity>
                <Property name="key">23</Property>
                <Property name="value">23-高山族</Property>
              </Entity>
              <Entity>
                <Property name="key">24</Property>
                <Property name="value">24-拉祜族</Property>
              </Entity>
              <Entity>
                <Property name="key">25</Property>
                <Property name="value">25-水族</Property>
              </Entity>
              <Entity>
                <Property name="key">26</Property>
                <Property name="value">26-东乡族</Property>
              </Entity>
              <Entity>
                <Property name="key">27</Property>
                <Property name="value">27-纳西族</Property>
              </Entity>
              <Entity>
                <Property name="key">28</Property>
                <Property name="value">28-景颇族</Property>
              </Entity>
              <Entity>
                <Property name="key">29</Property>
                <Property name="value">29-柯尔克孜族</Property>
              </Entity>
              <Entity>
                <Property name="key">30</Property>
                <Property name="value">30-土族</Property>
              </Entity>
              <Entity>
                <Property name="key">31</Property>
                <Property name="value">31-达斡尔族</Property>
              </Entity>
              <Entity>
                <Property name="key">32</Property>
                <Property name="value">32-仫佬族</Property>
              </Entity>
              <Entity>
                <Property name="key">33</Property>
                <Property name="value">33-羌族</Property>
              </Entity>
              <Entity>
                <Property name="key">34</Property>
                <Property name="value">34-布朗族</Property>
              </Entity>
              <Entity>
                <Property name="key">35</Property>
                <Property name="value">35-撒拉族</Property>
              </Entity>
              <Entity>
                <Property name="key">36</Property>
                <Property name="value">36-毛南族</Property>
              </Entity>
              <Entity>
                <Property name="key">37</Property>
                <Property name="value">37-仡佬</Property>
              </Entity>
              <Entity>
                <Property name="key">38</Property>
                <Property name="value">38-锡伯族</Property>
              </Entity>
              <Entity>
                <Property name="key">39</Property>
                <Property name="value">39-阿昌族</Property>
              </Entity>
              <Entity>
                <Property name="key">40</Property>
                <Property name="value">40-普米族</Property>
              </Entity>
              <Entity>
                <Property name="key">41</Property>
                <Property name="value">41-塔吉克族</Property>
              </Entity>
              <Entity>
                <Property name="key">42</Property>
                <Property name="value">42-怒族</Property>
              </Entity>
              <Entity>
                <Property name="key">43</Property>
                <Property name="value">43-乌孜别克族</Property>
              </Entity>
              <Entity>
                <Property name="key">44</Property>
                <Property name="value">44-俄罗斯族</Property>
              </Entity>
              <Entity>
                <Property name="key">45</Property>
                <Property name="value">45-鄂温克族</Property>
              </Entity>
              <Entity>
                <Property name="key">46</Property>
                <Property name="value">46-崩龙族</Property>
              </Entity>
              <Entity>
                <Property name="key">47</Property>
                <Property name="value">47-保安族</Property>
              </Entity>
              <Entity>
                <Property name="key">48</Property>
                <Property name="value">48-裕固族</Property>
              </Entity>
              <Entity>
                <Property name="key">49</Property>
                <Property name="value">49-京族</Property>
              </Entity>
              <Entity>
                <Property name="key">50</Property>
                <Property name="value">50-塔塔尔族</Property>
              </Entity>
              <Entity>
                <Property name="key">51</Property>
                <Property name="value">51-独龙族</Property>
              </Entity>
              <Entity>
                <Property name="key">52</Property>
                <Property name="value">52-鄂伦春族</Property>
              </Entity>
              <Entity>
                <Property name="key">53</Property>
                <Property name="value">53-赫哲族</Property>
              </Entity>
              <Entity>
                <Property name="key">54</Property>
                <Property name="value">54-门巴族</Property>
              </Entity>
              <Entity>
                <Property name="key">55</Property>
                <Property name="value">55-珞巴族</Property>
              </Entity>
              <Entity>
                <Property name="key">56</Property>
                <Property name="value">56-基诺族</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
@@ -118,9 +374,64 @@
        <Property></Property>
        <Property name="label">政治面貌</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;ZZMM&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">01</Property>
                <Property name="value">01-中国共产党党员</Property>
              </Entity>
              <Entity>
                <Property name="key">02</Property>
                <Property name="value">02-中国共产党预备党员</Property>
              </Entity>
              <Entity>
                <Property name="key">03</Property>
                <Property name="value">03-中国共产主义青年团团员</Property>
              </Entity>
              <Entity>
                <Property name="key">04</Property>
                <Property name="value">04-中国国民党革命委员会会员</Property>
              </Entity>
              <Entity>
                <Property name="key">05</Property>
                <Property name="value">05-中国主同盟盟员</Property>
              </Entity>
              <Entity>
                <Property name="key">06</Property>
                <Property name="value">06-中国民主建国会会员</Property>
              </Entity>
              <Entity>
                <Property name="key">07</Property>
                <Property name="value">07-中国民主促进会会员</Property>
              </Entity>
              <Entity>
                <Property name="key">08</Property>
                <Property name="value">08-中国农工民主党党员</Property>
              </Entity>
              <Entity>
                <Property name="key">09</Property>
                <Property name="value">09-中国致公党党员</Property>
              </Entity>
              <Entity>
                <Property name="key">10</Property>
                <Property name="value">10-九三学社社员</Property>
              </Entity>
              <Entity>
                <Property name="key">11</Property>
                <Property name="value">11-台湾民主自治同盟盟员</Property>
              </Entity>
              <Entity>
                <Property name="key">12</Property>
                <Property name="value">12-无党派民主人士</Property>
              </Entity>
              <Entity>
                <Property name="key">13</Property>
                <Property name="value">13-群众</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
@@ -128,9 +439,80 @@
        <Property></Property>
        <Property name="label">人员类别</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;RYLB&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1100</Property>
                <Property name="value">1100-公务员</Property>
              </Entity>
              <Entity>
                <Property name="key">1200</Property>
                <Property name="value">1200-事业单位管理人员</Property>
              </Entity>
              <Entity>
                <Property name="key">1300</Property>
                <Property name="value">1300-企业经营管理人员</Property>
              </Entity>
              <Entity>
                <Property name="key">1400</Property>
                <Property name="value">1400-专业技术人员</Property>
              </Entity>
              <Entity>
                <Property name="key">1410</Property>
                <Property name="value">1410-高级职称</Property>
              </Entity>
              <Entity>
                <Property name="key">1411</Property>
                <Property name="value">1411-正高级职称</Property>
              </Entity>
              <Entity>
                <Property name="key">1420</Property>
                <Property name="value">1420-中级职称</Property>
              </Entity>
              <Entity>
                <Property name="key">1430</Property>
                <Property name="value">1430-初级及以下职称</Property>
              </Entity>
              <Entity>
                <Property name="key">1431</Property>
                <Property name="value">1431-主要专职保管人员</Property>
              </Entity>
              <Entity>
                <Property name="key">1432</Property>
                <Property name="value">1432-主要专职检化验人员</Property>
              </Entity>
              <Entity>
                <Property name="key">1500</Property>
                <Property name="value">1500-工人</Property>
              </Entity>
              <Entity>
                <Property name="key">1510</Property>
                <Property name="value">1510-技术工人</Property>
              </Entity>
              <Entity>
                <Property name="key">1511</Property>
                <Property name="value">1511-高级技师</Property>
              </Entity>
              <Entity>
                <Property name="key">1512</Property>
                <Property name="value">1512-技师</Property>
              </Entity>
              <Entity>
                <Property name="key">1513</Property>
                <Property name="value">1513-高级工</Property>
              </Entity>
              <Entity>
                <Property name="key">1514</Property>
                <Property name="value">1514-中级工</Property>
              </Entity>
              <Entity>
                <Property name="key">1515</Property>
                <Property name="value">1515-初级工</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="zy">
@@ -139,15 +521,38 @@
      </PropertyDef>
      <PropertyDef name="qdzgzchzyzgsj">
        <Property name="dataType">Date</Property>
        <Property name="label">取得最高职称或职业资格时间</Property>
        <Property name="label">职业资格时间</Property>
      </PropertyDef>
      <PropertyDef name="xl">
        <Property></Property>
        <Property name="label">学历</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;XL&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">0</Property>
                <Property name="value">0-研究生</Property>
              </Entity>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1-大学本科</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">2-大学专科</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">3-中专</Property>
              </Entity>
              <Entity>
                <Property name="key">4</Property>
                <Property name="value">4-高中及以下</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
@@ -169,14 +574,6 @@
      </PropertyDef>
      <PropertyDef name="userId">
        <Property name="label">身份证号</Property>
      </PropertyDef>
      <PropertyDef name="start">
        <Property name="label">入职日期（开始）</Property>
        <Property name="dataType">Date</Property>
      </PropertyDef>
      <PropertyDef name="end">
        <Property name="label">入职日期（结束）</Property>
        <Property name="dataType">Date</Property>
      </PropertyDef>
    </DataType>
  </Model>
@@ -262,12 +659,6 @@
            <Property name="exClassName">btn-normal</Property>
            <Property name="iconClass">fa fa-search</Property>
          </Button>
          <Button layoutConstraint="left">
            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).flushAsync();</ClientEvent>
            <Property name="caption">重置</Property>
            <Property name="iconClass">fa fa-refresh</Property>
            <Property name="exClassName">btn-default</Property>
          </Button>
        </Container>
      </AutoForm>
      <DataGrid id="dgMain">
@@ -278,12 +669,12 @@
        <RowNumColumn>
          <Property name="caption">序号</Property>
        </RowNumColumn>
        <DataColumn name="lsbm">
          <Property name="property">lsbm</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="xm">
          <Property name="property">xm</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="lsbm">
          <Property name="property">lsbm</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="xb">
@@ -306,22 +697,6 @@
          <Property name="property">mz</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="rylb">
          <Property name="property">rylb</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="zy">
          <Property name="property">zy</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="qdzgzchzyzgsj">
          <Property name="property">qdzgzchzyzgsj</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="xl">
          <Property name="property">xl</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="zw">
          <Property name="property">zw</Property>
          <Property name="align">center</Property>
@@ -341,8 +716,8 @@
    </Container>
    <Dialog id="dialogMain">
      <Property name="closeable">false</Property>
      <Property name="caption">仓库设备信息</Property>
      <Property name="width">80%</Property>
      <Property name="caption">人员信息</Property>
      <Property name="width">70%</Property>
      <Property name="iconClass">fa fa-tasks</Property>
      <Buttons>
        <Button id="btnOk">
@@ -367,23 +742,23 @@
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*,*</Property>
          <Property name="labelAlign">left</Property>
          <Property name="cols">*,*</Property>
          <Property name="labelAlign">right</Property>
          <Property name="labelSeparator">：</Property>
          <Property name="labelPosition">top</Property>
          <AutoFormElement>
            <Property name="name">lsbm</Property>
            <Property name="property">lsbm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">xzqhdm</Property>
            <Property name="property">xzqhdm</Property>
            <Editor/>
          </AutoFormElement>
          <Property name="labelWidth">120</Property>
          <AutoFormElement>
            <Property name="name">xm</Property>
            <Property name="property">xm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sfzhm</Property>
            <Property name="property">sfzhm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">deptId</Property>
            <Property name="property">deptId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -392,8 +767,14 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sfzhm</Property>
            <Property name="property">sfzhm</Property>
            <Property name="name">lsbm</Property>
            <Property name="property">lsbm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">xzqhmc</Property>
            <Property name="property">xzqhmc</Property>
            <Property name="trigger">ddFoodOrigin</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -487,5 +868,66 @@
      <Property name="service">staffPR#delData</Property>
      <Property name="confirmMessage">确定要执行删除么？</Property>
    </AjaxAction>
    <CustomDropDown id="ddFoodOrigin">
      <Property name="minHeight">500</Property>
      <Property name="assignmentMap">xzqhmc=name,xzqhdm=code</Property>
      <Property name="minWidth">500</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsFoodOrigin">
          <Property name="dataProvider">dicAreaPR#pageList</Property>
          <Property name="dataType">[dtArea]</Property>
          <Property name="parameter"></Property>
          <Property name="pageSize">30</Property>
        </DataSet>
        <Container layout="hbox regionPadding:5">
          <TextEditor id="key2">
            <Property name="blankText"> -- 编码或者名称 --</Property>
            <Property name="width">200</Property>
          </TextEditor>
          <Button>
            <ClientEvent name="onClick">var key = view.get(&quot;#key2.value&quot;);&#xD;
              view.get(&quot;#dsFoodOrigin&quot;).set(&quot;parameter&quot;,{key:key}).flushAsync();</ClientEvent>
            <Property name="caption">查询</Property>
            <Property name="iconClass">fa fa-search</Property>
          </Button>
          <Button>
            <ClientEvent name="onClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
              if(data){&#xD;
              view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
              }</ClientEvent>
            <Property name="iconClass">fa fa-check</Property>
            <Property name="caption">确定</Property>
          </Button>
        </Container>
        <DataGrid>
          <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
            if(data){&#xD;
            view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
            }</ClientEvent>
          <Property name="dataSet">dsFoodOrigin</Property>
          <Property name="readOnly">true</Property>
          <DataColumn name="code">
            <Property name="property">code</Property>
            <Property name="readOnly">true</Property>
            <Property name="align">center</Property>
          </DataColumn>
          <DataColumn name="name">
            <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
              arg.processDefault = true;</ClientEvent>
            <Property name="property">name</Property>
            <Property name="readOnly">true</Property>
            <Property name="align">center</Property>
          </DataColumn>
          <DataColumn name="simple">
            <Property name="property">simple</Property>
            <Property name="readOnly">true</Property>
            <Property name="align">center</Property>
          </DataColumn>
        </DataGrid>
        <DataPilot layoutConstraint="bottom">
          <Property name="dataSet">dsFoodOrigin</Property>
        </DataPilot>
      </Container>
    </CustomDropDown>
  </View>
</ViewConfig>

 igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java

@@ -39,7 +39,7 @@
            //徐闻服务器使用
//            bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);

            //江西赣州、广东高州使用
            //江西赣州、广东高州使用、西藏山南、宁夏石嘴山、广东佛山
            bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
            //广东高州使用
//            bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);