增加库区配置，合并通知单、及流程和设备配置

czt

2025-12-26 4aff6ce5a44047245f86e776d3b6b67314aed70e

增加库区配置，合并通知单、及流程和设备配置

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

@@ -29,6 +29,10 @@
    @TableField("id")
    private String id;

    @Column(name = "parent_id", columnDefinition = "varchar(40) COMMENT '收储公司'")
    @TableField("parent_id")
    private String parentId;

    @Column(name = "kqmc", columnDefinition = "varchar(256) COMMENT '库区名称'")
    @TableField("kqmc")
    private String kqmc;

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

@@ -87,7 +87,9 @@
            return;
        }
        Dept dept = new Dept();
        dept.setId(sysDept.getDeptId() + "");
        String deptId = sysDept.getDeptId() + "";
        dept.setId(deptId);
        dept.setParentId(deptId.substring(0, deptId.length() - 3));
        dept.setKqmc(sysDept.getDeptName());
        dept.setCompanyId(sysDept.getCompanyId());


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,224 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
  <Arguments/>
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.igds.domain.Dept</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">库区编码</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="parentId">
        <Property></Property>
        <Property name="label">收储公司</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">dwmc</Property>
        </Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">组织编码</Property>
      </PropertyDef>
      <PropertyDef name="kqmc">
        <Property></Property>
        <Property name="label">库区名称</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="kqdz">
        <Property></Property>
        <Property name="label">库区地址</Property>
      </PropertyDef>
      <PropertyDef name="xzqhdm">
        <Property></Property>
        <Property name="label">区划代码</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="xzqhmc">
        <Property></Property>
        <Property name="label">所在区县</Property>
      </PropertyDef>
      <PropertyDef name="kqcq">
        <Property></Property>
        <Property name="label">库区产权</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <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>
              <Entity>
                <Property name="key">9</Property>
                <Property name="value">9-其他</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="yxcr">
        <Property name="dataType">Double</Property>
        <Property name="label">有效仓容</Property>
        <Property name="displayFormat">#0.000 å¨</Property>
      </PropertyDef>
      <PropertyDef name="zdmj">
        <Property name="dataType">Double</Property>
        <Property name="label">占地面积</Property>
        <Property name="displayFormat">#0.000 å¹³æ–¹ç±³</Property>
      </PropertyDef>
      <PropertyDef name="cfs">
        <Property name="dataType">Integer</Property>
        <Property name="label">仓库数</Property>
        <Property name="displayFormat">#0 æ ‹</Property>
      </PropertyDef>
      <PropertyDef name="jd">
        <Property name="dataType">Double</Property>
        <Property name="label">经度</Property>
      </PropertyDef>
      <PropertyDef name="wd">
        <Property name="dataType">Double</Property>
        <Property name="label">纬度</Property>
      </PropertyDef>
      <PropertyDef name="remark">
        <Property></Property>
        <Property name="label">备注说明</Property>
      </PropertyDef>
      <PropertyDef name="createTime">
        <Property name="dataType">DateTime</Property>
        <Property name="label">创建时间</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="createBy">
        <Property></Property>
        <Property name="label">创建人</Property>
        <Property name="readOnly">true</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>
      <PropertyDef name="imgPath">
        <Property></Property>
        <Property name="label">图路径</Property>
      </PropertyDef>
      <PropertyDef name="imgName">
        <Property></Property>
        <Property name="label">鸟瞰图</Property>
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="padding:10">
    <ClientEvent name="onReady">

/**&#xD;
* å‡ºå…¥åº“配置&#xD;
*/&#xD;
inoutConf = function(){&#xD;
    var cur = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;);&#xD;
    if(cur){&#xD;
        var deptId = cur.get(&quot;id&quot;);&#xD;
        var url = &quot;/com.fzzy.igds.inoutConfManage.d?deptId=&quot;+ deptId;&#xD;
        window.$openTab(&quot;出入库配置&quot;, url);
    }else{&#xD;
        $notify(&quot;请先选择库区……&quot;);&#xD;
    }
};&#xD;

/**&#xD;
* æŠ“拍配置&#xD;
*/&#xD;
snapConf = function(){&#xD;
    var cur = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;);&#xD;
    if(cur){&#xD;
        var deptId = cur.get(&quot;id&quot;);&#xD;
        var url = &quot;/com.fzzy.igds.SnapConf.d?deptId=&quot;+ deptId;&#xD;
        window.$openTab(&quot;抓拍配置&quot;, url);
    }else{&#xD;
        $notify(&quot;请先选择库区……&quot;);&#xD;
    }
};&#xD;

/**&#xD;
* å·¡æ£€é…ç½®&#xD;
*/&#xD;
patrolConf = function(){&#xD;
    var cur = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;);&#xD;
    if(cur){&#xD;
        var deptId = cur.get(&quot;id&quot;);&#xD;
        var url = &quot;/com.fzzy.igds.PatrolConf.d?deptId=&quot;+ deptId;&#xD;
        window.$openTab(&quot;巡检配置&quot;, url);
    }else{&#xD;
        $notify(&quot;请先选择库区……&quot;);&#xD;
    }
};&#xD;

//操作&#xD;
renderCell1 = function(arg,self){&#xD;
    var data = arg.data;&#xD;
    var htm = &quot;&lt;a onClick='inoutConf()' class='a-btn1'>出入库配置&lt;/a>&amp;nbsp;|&amp;nbsp;&lt;a onClick='snapConf()' class='a-btn2'>抓拍配置&lt;/a>&amp;nbsp;|&amp;nbsp;&lt;a onClick='patrolConf()' class='a-btn4'>巡检配置&lt;/a>&quot;;&#xD;
    arg.dom.innerHTML = htm;&#xD;
};&#xD;
&#xD;</ClientEvent>
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataProvider">deptPR#getData</Property>
      <Property name="dataType">[dtMain]</Property>
    </DataSet>
    <Container>
      <Property name="className">c-param</Property>
      <DataGrid id="dgMain" layoutConstraint="padding:8">
        <ClientEvent name="onDataRowClick">view.get(&quot;#dgMain&quot;).set(&quot;selection&quot;,arg.data);</ClientEvent>
        <Property name="dataSet">dsMain</Property>
        <Property name="readOnly">true</Property>
        <Property name="selectionMode">singleRow</Property>
        <RowSelectorColumn/>
        <RowNumColumn/>
        <DataColumn name="parentId">
          <Property name="property">parentId</Property>
          <Property name="align">left</Property>
          <Property name="width">360</Property>
        </DataColumn>
        <DataColumn name="kqmc">
          <Property name="property">kqmc</Property>
          <Property name="align">left</Property>
          <Property name="width">380</Property>
        </DataColumn>
        <DataColumn name="xzqhmc">
          <Property name="property">xzqhmc</Property>
          <Property name="align">center</Property>
          <Property name="width">160</Property>
        </DataColumn>
        <DataColumn>
          <ClientEvent name="onRenderCell">renderCell1(arg,self);</ClientEvent>
          <Property name="caption">配置</Property>
          <Property name="align">center</Property>
          <Editor/>
        </DataColumn>
      </DataGrid>
    </Container>
  </View>
</ViewConfig>

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

@@ -10,6 +10,16 @@
        <Property name="label">库区编码</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="parentId">
        <Property></Property>
        <Property name="label">收储公司</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">dwmc</Property>
        </Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">组织编码</Property>
@@ -30,7 +40,7 @@
      </PropertyDef>
      <PropertyDef name="xzqhmc">
        <Property></Property>
        <Property name="label">区划名称</Property>
        <Property name="label">所在区县</Property>
      </PropertyDef>
      <PropertyDef name="kqcq">
        <Property></Property>
@@ -184,22 +194,16 @@
          <Property name="property">kqmc</Property>
          <Property name="align">left</Property>
        </DataColumn>
        <DataColumn name="parentId">
          <Property name="property">parentId</Property>
          <Property name="align">left</Property>
        </DataColumn>
        <DataColumn name="xzqhmc">
          <Property name="property">xzqhmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="kqcq">
          <Property name="property">kqcq</Property>
          <Property name="align">center</Property>
          <Property name="width">120</Property>
        </DataColumn>
        <DataColumn name="yxcr">
          <Property name="property">yxcr</Property>
          <Property name="align">center</Property>
          <Property name="width">180</Property>
        </DataColumn>
        <DataColumn name="zdmj">
          <Property name="property">zdmj</Property>
          <Property name="align">center</Property>
          <Property name="width">180</Property>
        </DataColumn>
@@ -223,7 +227,7 @@
    <Dialog id="dialogMain">
      <Property name="iconClass">fa fa-tasks</Property>
      <Property name="caption">库区信息</Property>
      <Property name="width">70%</Property>
      <Property name="width">65%</Property>
      <Property name="closeable">false</Property>
      <Buttons>
        <Button id="btnOk">
@@ -267,13 +271,8 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement layoutConstraint="colSpan:2">
            <Property name="name">kqdz</Property>
            <Property name="property">kqdz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqcq</Property>
            <Property name="property">kqcq</Property>
            <Property name="name">parentId</Property>
            <Property name="property">parentId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -281,9 +280,9 @@
            <Property name="property">yxcr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zdmj</Property>
            <Property name="property">zdmj</Property>
          <AutoFormElement layoutConstraint="colSpan:2">
            <Property name="name">kqdz</Property>
            <Property name="property">kqdz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -302,17 +301,14 @@
            <Property name="property">xzqhdm</Property>
            <Editor/>
          </AutoFormElement>
          <Label>
            <Property name="text"></Property>
          </Label>
          <AutoFormElement>
            <Property name="name">createBy</Property>
            <Property name="property">createBy</Property>
            <Property name="name">zdmj</Property>
            <Property name="property">zdmj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">createTime</Property>
            <Property name="property">createTime</Property>
          <AutoFormElement layoutConstraint="colSpan:2">
            <Property name="name">remark</Property>
            <Property name="property">remark</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -371,11 +367,6 @@
            </Property>
            <Property name="text">帮助：点击坐标位置拾取</Property>
          </Link>
          <AutoFormElement layoutConstraint="colSpan:3">
            <Property name="name">remark</Property>
            <Property name="property">remark</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
  <Arguments/>
  <Context/>
  <Model/>
  <View layout="padding:10">
    <Property name="packages">font-awesome,css-common</Property>
    <TabControl>
      <IFrameTab>
        <Property name="caption">流程配置</Property>
        <Property name="path">com.fzzy.igds.InoutSysConf.d</Property>
        <Property name="width">200</Property>
        <Property name="iconClass">fa fa-gavel</Property>
      </IFrameTab>
      <IFrameTab>
        <Property name="caption">设备配置</Property>
        <Property name="path">com.fzzy.igds.InoutConf.d</Property>
        <Property name="width">200</Property>
        <Property name="iconClass">fa fa-shopping-cart</Property>
      </IFrameTab>
    </TabControl>
  </View>
</ViewConfig>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
  <Arguments/>
  <Context/>
  <Model/>
  <View layout="padding:10">
    <Property name="packages">font-awesome,css-common</Property>
    <TabControl>
      <IFrameTab>
        <Property name="caption">入库通知单</Property>
        <Property name="path">com.fzzy.igds.InoutNoticeIn.d</Property>
        <Property name="width">200</Property>
        <Property name="iconClass">fa fa-gavel</Property>
      </IFrameTab>
      <IFrameTab>
        <Property name="caption">出库通知单</Property>
        <Property name="path">com.fzzy.igds.InoutNoticeOut.d</Property>
        <Property name="width">200</Property>
        <Property name="iconClass">fa fa-shopping-cart</Property>
      </IFrameTab>
    </TabControl>
  </View>
</ViewConfig>

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

@@ -139,10 +139,10 @@
        </Button>
        <Button>
          <ClientEvent name="onClick">
            var url = &quot;/com.fzzy.igds.PatrolConf.d&quot;;&#xD;
            window.$openTab(&quot;巡更配置&quot;, url);
            var url = &quot;/com.fzzy.igds.ConfByDept.d&quot;;&#xD;
            window.$openTab(&quot;库区配置&quot;, url);
          </ClientEvent>
          <Property name="caption">巡更配置</Property>
          <Property name="caption">库区配置</Property>
          <Property name="exClassName">btn-q1</Property>
          <Property name="iconClass">fa fa-plus-square</Property>
        </Button>

 fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js

@@ -336,14 +336,6 @@
    });
}
function openConf() {
    var url = ctx + "com.fzzy.igds.SnapConf.d";
    var options = {
        title: "抓拍配置",
        url: url,
        btn: 0,
        yes: function (index, layero) {
            $.modal.close(index);
        }
    };
    $.modal.openOptions(options);
    var url = ctx + "com.fzzy.igds.ConfByDept.d";
    $.modal.openTab("库区配置", url);
}

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

@@ -51,11 +51,6 @@
                    </ul>
                </div>
            </form>
            <div class="btn-group-sm" role="group">
                <a class="btn btn-success">
                    <i class="fa fa-plus"></i> äº‹ä»¶é…ç½®
                </a>
            </div>
        </div>

        <div class="col-sm-12 " style="padding-top: 10px;background: #FFFFFF;margin-top: 10px;">

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

@@ -55,7 +55,7 @@
            </form>
            <div class="btn-group-sm" role="group">
                <a class="btn btn-success" onclick="openConf()">
                    <i class="fa fa-plus"></i> æŠ“拍配置
                    <i class="fa fa-plus"></i> åº“区配置
                </a>
            </div>
        </div>