czt
2025-12-29 b1798fdc3ef26d88e53c1578a242011db2b6c7cf
合同增加仓库字段,关联公司、库区联动下拉
已修改3个文件
已添加1个文件
211 ■■■■■ 文件已修改
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-view/src/main/java/models/core.model.xml 129 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-web/src/main/resources/lib/dorado-skin-ruoyi-1.0.10.jar 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
@@ -92,6 +92,15 @@
    }
    /**
     * depotPR#getDataByCompanyId
     * @return
     */
    @DataProvider
    public List<Depot> getDataByCompanyId(){
        return depotService.getData(null, null ,false);
    }
    /**
     * depotPR#getDepot 获取仓库信息
     *
     * @param depotId
fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml
@@ -21,6 +21,18 @@
      <ClientEvent name="onReady">self.insert({});</ClientEvent>
      <Property name="dataType">dtBaseParam</Property>
    </DataSet>
    <DataSet id="dsDeptList">
      <Property name="dataProvider">deptPR#getData</Property>
      <Property name="userData">库区列表下拉框</Property>
      <Property name="loadMode">manual</Property>
      <Property name="dataType">[dtDept]</Property>
    </DataSet>
    <DataSet id="dsDepotList">
      <Property name="dataProvider">depotPR#getData</Property>
      <Property name="userData">仓库列表下拉框</Property>
      <Property name="loadMode">manual</Property>
      <Property name="dataType">[dtDepot]</Property>
    </DataSet>
    <Container>
      <Property name="className">c-param</Property>
      <AutoForm>
@@ -67,8 +79,11 @@
        </ToolBarButton>
        <ToolBarButton>
          <ClientEvent name="onClick">var data = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;);
if(data){&#xD;
view.get(&quot;#dialogMain&quot;).show();
        </ClientEvent>
}else{&#xD;
    $notify(&quot;请选择需要修改的信息……&quot;);&#xD;
}&#xD;</ClientEvent>
          <Property name="id">btnUpdate</Property>
          <Property name="caption">修改</Property>
          <Property name="exClassName">btn2</Property>
@@ -78,7 +93,7 @@
        <ToolBarButton>
          <ClientEvent name="onClick">var data = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;)
if(!data){
    $alert(&quot;请选择数据&quot;);
    $alert(&quot;请选择需要删除的信息……&quot;);
    }else{
    view.get(&quot;#ajaxDelData&quot;).set(&quot;parameter&quot;, data).execute(function(result){
        if(&quot;200&quot;!=result.code){
@@ -143,7 +158,7 @@
    <Dialog id="dialogMain" layout="regionPadding:8">
      <Property name="closeable">false</Property>
      <Property name="caption">质押合同</Property>
      <Property name="width">65%</Property>
      <Property name="width">80%</Property>
      <Property name="iconClass">fa fa-tasks</Property>
      <Property name="height">90%</Property>
      <Buttons>
@@ -212,6 +227,7 @@
            <AutoFormElement>
              <Property name="name">pledgeDept</Property>
              <Property name="property">pledgeDept</Property>
              <Property name="trigger">dsDeptDropDown</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
@@ -257,6 +273,7 @@
            <AutoFormElement>
              <Property name="name">depotIds</Property>
              <Property name="property">depotIds</Property>
              <Property name="trigger">dsDepotDropDown</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement layoutConstraint="colSpan:3">
@@ -303,5 +320,55 @@
    <AjaxAction id="ajaxInitAdd">
      <Property name="service">pledgeContractPR#initAdd</Property>
    </AjaxAction>
    <DataSetDropDown id="dsDeptDropDown">
      <ClientEvent name="onOpen">&#xD;
var entity = view.get(&quot;#dsMain.data:#&quot;);&#xD;
if(!entity){&#xD;
    $alert(&quot;请先选择质押公司&quot;);&#xD;
}else{&#xD;
    var pledgeCompany = entity.get(&quot;pledgeCompany&quot;);&#xD;
    if(!pledgeCompany){&#xD;
        $alert(&quot;请先选择质押公司&quot;);&#xD;
    }else{&#xD;
        view.get(&quot;#dsDeptList&quot;).set(&quot;parameter&quot;,entity.get(&quot;pledgeCompany&quot;)).flushAsync();&#xD;
    }
}</ClientEvent>
      <Property name="dataSet">dsDeptList</Property>
      <Property name="height">450</Property>
      <Property name="autoOpen">true</Property>
      <Property name="assignmentMap">pledgeDept=id</Property>
      <Property name="width">400</Property>
      <DataColumn>
        <Property name="align">center</Property>
        <Property name="name">kqmc</Property>
        <Property name="property">kqmc</Property>
        <Editor/>
      </DataColumn>
    </DataSetDropDown>
    <DataSetDropDown id="dsDepotDropDown">
      <ClientEvent name="onOpen">&#xD;
var entity = view.get(&quot;#dsMain.data:#&quot;);&#xD;
if(!entity){&#xD;
    $alert(&quot;请先选择质押库区&quot;);&#xD;
}else{&#xD;
    var pledgeDept = entity.get(&quot;pledgeDept&quot;);&#xD;
    if(!pledgeDept){&#xD;
        $alert(&quot;请先选择质押库区&quot;);&#xD;
    }else{&#xD;
        view.get(&quot;#dsDepotList&quot;).set(&quot;parameter&quot;,entity.get(&quot;pledgeDept&quot;)).flushAsync();&#xD;
    }
}</ClientEvent>
      <Property name="dataSet">dsDepotList</Property>
      <Property name="height">400</Property>
      <Property name="autoOpen">true</Property>
      <Property name="assignmentMap">depotIds=id</Property>
      <Property name="width">400</Property>
      <DataColumn>
        <Property name="align">center</Property>
        <Property name="name">name</Property>
        <Property name="property">name</Property>
        <Editor/>
      </DataColumn>
    </DataSetDropDown>
  </View>
</ViewConfig>
fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -1077,7 +1077,7 @@
      <Property></Property>
      <Property name="label">质押仓库</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getDataByCompanyId&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
@@ -1880,4 +1880,131 @@
      <Property name="label">更新时间</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtDept">
    <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>
fzzy-igdss-web/src/main/resources/lib/dorado-skin-ruoyi-1.0.10.jar
Binary files differ