fzzy-igdss.git - Gitblit

sgj

2026-01-15 27ab62f7d980e13e3fe5cd3ac5a979c7d5fc92b7

库区，仓库联动查询修改

已修改5个文件

	fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeIn.view.xml	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-view/src/main/java/models/core.model.xml	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -72,7 +72,7 @@
        <Property></Property>
        <Property name="label">所属库区</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getDeptByUserType&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">kqmc</Property>
        </Property>
@@ -117,6 +117,12 @@
      <Property name="dataType">dataTypeC</Property>
      <Property name="dataProvider">quantityDataPR#getQuery</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>
@@ -134,7 +140,7 @@
        <AutoFormElement>
          <Property name="name">depotId</Property>
          <Property name="property">depotId</Property>
          <Property name="trigger">autoMappingDropDown2</Property>
          <Property name="trigger">dsDepotDropDown</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
@@ -268,5 +274,33 @@
        </DataPilot>
      </ToolBar>
    </Container>
    <DataSetDropDown id="dsDepotDropDown">
      <ClientEvent name="onOpen">&#xD;
        var entity = view.get(&quot;#dataSetC.data:#&quot;);&#xD;
        console.log(entity);&#xD;
        if(!entity){&#xD;
        $alert(&quot;请先选择所属库区&quot;);&#xD;
        }else{&#xD;
        var deptId = entity.get(&quot;deptId&quot;);&#xD;
                console.log(deptId);&#xD;
&#xD;
        if(!deptId){&#xD;
        $alert(&quot;请先选择所属库区&quot;);&#xD;
        }else{&#xD;
        view.get(&quot;#dsDepotList&quot;).set(&quot;parameter&quot;,entity.get(&quot;deptId&quot;)).flushAsync();&#xD;
        }
        }</ClientEvent>
      <Property name="dataSet">dsDepotList</Property>
      <Property name="height">450</Property>
      <Property name="autoOpen">true</Property>
      <Property name="assignmentMap">depotId=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/com/fzzy/igds/QuantityDataPR.java

@@ -2,6 +2,7 @@

import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.data.provider.Page;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.QuantityParam;
import com.fzzy.igds.domain.Quantity;
import com.fzzy.igds.service.QuantityService;
@@ -43,7 +44,9 @@
        result.setTitle("数量检测数据");
        if (null != subDept) {
            result.setTitle(subDept.getDeptName() + "数量检测数据");
            result.setDeptId(String.valueOf(subDept.getDeptId()));
            if(Constant.DEPT_TYPE_20.equals(subDept.getType())){
                result.setDeptId(String.valueOf(subDept.getDeptId()));
            }
        }
        result.setEnd(new Date());
        Date start = DateUtil.getNewByDay(new Date(), -90);

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

@@ -60,6 +60,12 @@
      <Property name="dataProvider">inoutNoticePR#getYearQuery</Property>
      <Property name="dataType">dtNoticeParam</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>
@@ -75,6 +81,7 @@
        <AutoFormElement>
          <Property name="name">depotId</Property>
          <Property name="property">depotId</Property>
          <Property name="trigger">dsDepotDropDown</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
@@ -358,5 +365,30 @@
    <AjaxAction id="recalculate">
      <Property name="service">inoutNoticePR#updateSumNoticeIn</Property>
    </AjaxAction>
    <DataSetDropDown id="dsDepotDropDown">
      <ClientEvent name="onOpen">&#xD;
        var entity = view.get(&quot;#dsQuery.data:#&quot;);&#xD;
        if(!entity){&#xD;
        $alert(&quot;请先选择所属库区&quot;);&#xD;
        }else{&#xD;
        var deptId = entity.get(&quot;deptId&quot;);&#xD;
        if(!deptId){&#xD;
        $alert(&quot;请先选择所属库区&quot;);&#xD;
        }else{&#xD;
        view.get(&quot;#dsDepotList&quot;).set(&quot;parameter&quot;,entity.get(&quot;deptId&quot;)).flushAsync();&#xD;
        }
        }</ClientEvent>
      <Property name="dataSet">dsDepotList</Property>
      <Property name="height">450</Property>
      <Property name="autoOpen">true</Property>
      <Property name="assignmentMap">depotId=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/com/fzzy/igds/zy/InoutNoticeOut.view.xml

@@ -60,6 +60,12 @@
      <Property name="dataType">dtNoticeParam</Property>
      <Property name="dataProvider">inoutNoticePR#getYearQuery</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>
@@ -75,6 +81,7 @@
        <AutoFormElement>
          <Property name="name">depotId</Property>
          <Property name="property">depotId</Property>
          <Property name="trigger">dsDepotDropDown</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
@@ -366,5 +373,30 @@
    <AjaxAction id="recalculate">
      <Property name="service">inoutNoticePR#updateSumNoticeOut</Property>
    </AjaxAction>
    <DataSetDropDown id="dsDepotDropDown">
      <ClientEvent name="onOpen">&#xD;
        var entity = view.get(&quot;#dsQuery.data:#&quot;);&#xD;
        if(!entity){&#xD;
        $alert(&quot;请先选择所属库区&quot;);&#xD;
        }else{&#xD;
        var deptId = entity.get(&quot;deptId&quot;);&#xD;
        if(!deptId){&#xD;
        $alert(&quot;请先选择所属库区&quot;);&#xD;
        }else{&#xD;
        view.get(&quot;#dsDepotList&quot;).set(&quot;parameter&quot;,entity.get(&quot;deptId&quot;)).flushAsync();&#xD;
        }
        }</ClientEvent>
      <Property name="dataSet">dsDepotList</Property>
      <Property name="height">450</Property>
      <Property name="autoOpen">true</Property>
      <Property name="assignmentMap">depotId=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

@@ -963,12 +963,17 @@
    <PropertyDef name="deptId">
      <Property></Property>
      <Property name="label">所属库区</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getDeptByUserType&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">kqmc</Property>
      </Property>
    </PropertyDef>
    <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="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>

			@@ -72,7 +72,7 @@
			<Property></Property>
			<Property name="label">所属库区</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
			<Property name="mapValues">${dorado.getDataProvider("deptPR#getDeptByUserType").getResult()}</Property>
			<Property name="keyProperty">id</Property>
			<Property name="valueProperty">kqmc</Property>
			</Property>
			@@ -117,6 +117,12 @@
			<Property name="dataType">dataTypeC</Property>
			<Property name="dataProvider">quantityDataPR#getQuery</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>
			@@ -134,7 +140,7 @@
			<AutoFormElement>
			<Property name="name">depotId</Property>
			<Property name="property">depotId</Property>
			<Property name="trigger">autoMappingDropDown2</Property>
			<Property name="trigger">dsDepotDropDown</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			@@ -268,5 +274,33 @@
			</DataPilot>
			</ToolBar>
			</Container>
			<DataSetDropDown id="dsDepotDropDown">
			<ClientEvent name="onOpen">
			var entity = view.get("#dataSetC.data:#");
			console.log(entity);
			if(!entity){
			$alert("请先选择所属库区");
			}else{
			var deptId = entity.get("deptId");
			console.log(deptId);

			if(!deptId){
			$alert("请先选择所属库区");
			}else{
			view.get("#dsDepotList").set("parameter",entity.get("deptId")).flushAsync();
			}
			}</ClientEvent>
			<Property name="dataSet">dsDepotList</Property>
			<Property name="height">450</Property>
			<Property name="autoOpen">true</Property>
			<Property name="assignmentMap">depotId=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>

			@@ -2,6 +2,7 @@

			import com.bstek.dorado.annotation.DataProvider;
			import com.bstek.dorado.data.provider.Page;
			import com.fzzy.igds.constant.Constant;
			import com.fzzy.igds.data.QuantityParam;
			import com.fzzy.igds.domain.Quantity;
			import com.fzzy.igds.service.QuantityService;
			@@ -43,7 +44,9 @@
			result.setTitle("数量检测数据");
			if (null != subDept) {
			result.setTitle(subDept.getDeptName() + "数量检测数据");
			result.setDeptId(String.valueOf(subDept.getDeptId()));
			if(Constant.DEPT_TYPE_20.equals(subDept.getType())){
			result.setDeptId(String.valueOf(subDept.getDeptId()));
			}
			}
			result.setEnd(new Date());
			Date start = DateUtil.getNewByDay(new Date(), -90);

			@@ -60,6 +60,12 @@
			<Property name="dataProvider">inoutNoticePR#getYearQuery</Property>
			<Property name="dataType">dtNoticeParam</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>
			@@ -75,6 +81,7 @@
			<AutoFormElement>
			<Property name="name">depotId</Property>
			<Property name="property">depotId</Property>
			<Property name="trigger">dsDepotDropDown</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			@@ -358,5 +365,30 @@
			<AjaxAction id="recalculate">
			<Property name="service">inoutNoticePR#updateSumNoticeIn</Property>
			</AjaxAction>
			<DataSetDropDown id="dsDepotDropDown">
			<ClientEvent name="onOpen">
			var entity = view.get("#dsQuery.data:#");
			if(!entity){
			$alert("请先选择所属库区");
			}else{
			var deptId = entity.get("deptId");
			if(!deptId){
			$alert("请先选择所属库区");
			}else{
			view.get("#dsDepotList").set("parameter",entity.get("deptId")).flushAsync();
			}
			}</ClientEvent>
			<Property name="dataSet">dsDepotList</Property>
			<Property name="height">450</Property>
			<Property name="autoOpen">true</Property>
			<Property name="assignmentMap">depotId=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>

			@@ -963,12 +963,17 @@
			<PropertyDef name="deptId">
			<Property></Property>
			<Property name="label">所属库区</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("deptPR#getDeptByUserType").getResult()}</Property>
			<Property name="keyProperty">id</Property>
			<Property name="valueProperty">kqmc</Property>
			</Property>
			</PropertyDef>
			<PropertyDef name="depotId">
			<Property></Property>
			<Property name="label">执行仓库</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
			<Property name="mapValues">${dorado.getDataProvider("depotPR#getData").getResult()}</Property>
			<Property name="keyProperty">id</Property>
			<Property name="valueProperty">name</Property>
			</Property>