Merge remote-tracking branch 'origin/master'

sgj

2026-02-13 72a67eb9ba942e632c11906093c5cd14e364eed7

Merge remote-tracking branch 'origin/master'

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

@@ -83,20 +83,8 @@
}else{
    $notify("请选择需要修改的仓库……");
}</ClientEvent>
          <Property name="caption">信息修改</Property>
          <Property name="caption">修改</Property>
          <Property name="exClassName">btn2</Property>
          <Property name="width">100</Property>
          <Property name="iconClass">fa fa-pencil-square-o</Property>
        </ToolBarButton>
        <ToolBarButton>
          <ClientEvent name="onClick">var select = view.get(&quot;#dataGridDepot&quot;).get(&quot;selection&quot;);&#xD;
              if(select){&#xD;
              view.get(&quot;#depotdialog2&quot;).show();&#xD;
              }else{&#xD;
              $notify(&quot;请选择需要修改的仓库……&quot;);&#xD;
              }</ClientEvent>
          <Property name="caption">库存修改</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="width">100</Property>
          <Property name="iconClass">fa fa-pencil-square-o</Property>
        </ToolBarButton>
@@ -391,248 +379,9 @@
      </Children>
      <Tools/>
    </Dialog>
    <Dialog id="depotdialog2" layout="regionPadding:8">
      <Property name="iconClass">fa fa-tasks</Property>
      <Property name="caption">仓库信息</Property>
      <Property name="width">80%</Property>
      <Property name="height">90%</Property>
      <Property name="closeable">false</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">//同时提交历史书&#xD;
              var data = view.get(&quot;#dataSetdepot.data:#&quot;);&#xD;
              view.get(&quot;#updateactionSave2&quot;).execute(function(result){&#xD;
              if(result){&#xD;
              $notify(result);&#xD;
              }else{&#xD;
              self.get(&quot;parent&quot;).hide();&#xD;
              query();&#xD;
              }&#xD;
              });</ClientEvent>
          <Property name="caption">保存</Property>
          <Property name="iconClass">fa fa-check-circle</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="width">120</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dataSetdepot.data:#&quot;);&#xD;
              if(cur) cur.cancel();&#xD;
              self.get(&quot;parent&quot;).hide();</ClientEvent>
          <Property name="caption">取消</Property>
          <Property name="exClassName">btn3</Property>
          <Property name="iconClass">fa fa-times-circle</Property>
          <Property name="width">120</Property>
        </Button>
      </Buttons>
      <Children>
        <FieldSet layout="padding:5">
          <Property name="caption">基本信息</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="dataSet">dataSetdepot</Property>
              <Property name="readOnly">false</Property>
              <Property name="labelSeparator"> : </Property>
              <Property name="labelAlign">right</Property>
              <Property name="cols">*,*,*,*,*,*</Property>
              <Property name="labelWidth">80</Property>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">id</Property>
                <Property name="property">id</Property>
                <Property name="readOnly">true</Property>
                <Editor>
                  <TextEditor>
                    <Property name="blankText">-- ç³»ç»Ÿè‡ªåŠ¨ç”Ÿæˆ --</Property>
                  </TextEditor>
                </Editor>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">name</Property>
                <Property name="property">name</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">deptId</Property>
                <Property name="property">deptId</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">storageMax</Property>
                <Property name="property">storageMax</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">storeType</Property>
                <Property name="property">storeType</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">depotStatus</Property>
                <Property name="property">depotStatus</Property>
                <Property name="trigger">autoMappingDropDown2</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">depotType</Property>
                <Property name="property">depotType</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">storeKeeperName</Property>
                <Property name="property">storeKeeperName</Property>
                <Property name="trigger">triggerUserList</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">orderNum</Property>
                <Property name="property">orderNum</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:4">
                <Property name="name">remark</Property>
                <Property name="property">remark</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">updateTime</Property>
                <Property name="property">updateTime</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
        <FieldSet layout="padding:5">
          <Property name="caption">储粮信息</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="dataSet">dataSetdepot</Property>
              <Property name="readOnly">false</Property>
              <Property name="labelSeparator"> : </Property>
              <Property name="labelAlign">right</Property>
              <Property name="cols">*,*,*,*,*,*</Property>
              <Property name="labelWidth">80</Property>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">storageReal</Property>
                <Property name="property">storageReal</Property>
                <Property name="readOnly">false</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">foodVariety</Property>
                <Property name="property">foodVariety</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">foodLevel</Property>
                <Property name="property">foodLevel</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">foodYear</Property>
                <Property name="property">foodYear</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">foodLocation</Property>
                <Property name="property">foodLocation</Property>
                <Property name="trigger">ddFoodOrigin</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">storeDate</Property>
                <Property name="property">storeDate</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
        <FieldSet layout="padding:5">
          <Property name="caption">其他信息</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="dataSet">dataSetdepot</Property>
              <Property name="readOnly">false</Property>
              <Property name="labelSeparator"> : </Property>
              <Property name="labelAlign">right</Property>
              <Property name="cols">*,*,*,*,*,*,*,*</Property>
              <Property name="labelWidth">100</Property>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">length</Property>
                <Property name="property">length</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">width</Property>
                <Property name="property">width</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">height</Property>
                <Property name="property">height</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">bulkWeight</Property>
                <Property name="property">bulkWeight</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">perWet</Property>
                <Property name="property">perWet</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">perImpurity</Property>
                <Property name="property">perImpurity</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">checkDate</Property>
                <Property name="property">checkDate</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="updateactionSave">
      <Property name="executingMessage">正在执行中..</Property>
      <Property name="dataResolver">depotPR#saveOrUpdate</Property>
      <UpdateItem>
        <Property name="dataSet">dataSetdepot</Property>
        <Property name="dataPath">[#current]</Property>
        <Property name="alias">data</Property>
      </UpdateItem>
    </UpdateAction>
    <UpdateAction id="updateactionSave2">
      <Property name="executingMessage">正在执行中..</Property>
      <Property name="dataResolver">depotPR#saveOrUpdate2</Property>
      <UpdateItem>
        <Property name="dataSet">dataSetdepot</Property>
        <Property name="dataPath">[#current]</Property>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,466 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
  <Arguments/>
  <Context/>
  <Model>
    <DataType name="dataTypeUser">
      <Property name="creationType">com.ruoyi.common.core.domain.entity.SysUser</Property>
      <PropertyDef name="loginName">
        <Property name="dataType">String</Property>
        <Property name="label">用户名</Property>
      </PropertyDef>
      <PropertyDef name="userName">
        <Property name="dataType">String</Property>
        <Property name="label">中文名</Property>
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="padding:10">
    <ClientEvent name="onReady">&#xD;
&#xD;
/**&#xD;
 * æŸ¥è¯¢&#xD;
 */&#xD;
query = function(){&#xD;
    //通过库区id来加载仓储数据&#xD;
    var parentId = &quot;${request.getParameter('parentId')}&quot;;&#xD;
    view.get(&quot;#dataSetdepot&quot;).set(&quot;parameter&quot;,{parentId: parentId}).flushAsync();&#xD;
};&#xD;query();&#xD;
&#xD;
&#xD;
showDlg=function(){&#xD;
    var select = view.get(&quot;#dataGridDepot&quot;).get(&quot;selection&quot;);&#xD;
    if(select){&#xD;
        view.get(&quot;#depotdialog&quot;).show();;&#xD;
    }else{&#xD;
         $notify(&quot;请先选择数据……&quot;);&#xD;
    }&#xD;
};&#xD;
&#xD;
renderId = function(arg){&#xD;
    var txt = arg.data.getText(&quot;id&quot;);&#xD;
    if(!txt) return true;&#xD;
    var htm = &quot;&lt;a href='javascript:;' onClick='showDlg()' >&quot;+txt+&quot;&lt;/a>&quot;;&#xD;
    arg.dom.innerHTML = htm;&#xD;
}&#xD;
&#xD;
renderName = function(arg){&#xD;
    var txt = arg.data.getText(&quot;name&quot;);&#xD;
    if(!txt) return true;&#xD;
    var htm = &quot;&lt;a href='javascript:;' onClick='showDlg()' >&quot;+txt+&quot;&lt;/a>&quot;;&#xD;
    arg.dom.innerHTML = htm;&#xD;
}
</ClientEvent>
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dataSetdepot">
      <Property name="dataProvider">depotPR#getData</Property>
      <Property name="dataType">[dtDepot]</Property>
      <Property name="loadMode">manual</Property>
    </DataSet>
    <DataSet id="dataSetUser">
      <Property name="dataType">[dataTypeUser]</Property>
      <Property name="dataProvider">sysUserPR#loadUser</Property>
    </DataSet>
    <Container>
      <Property name="className">c-param</Property>
      <ToolBar>
        <ToolBarButton>
          <ClientEvent name="onClick">var select = view.get(&quot;#dataGridDepot&quot;).get(&quot;selection&quot;);&#xD;
              if(select){&#xD;
              view.get(&quot;#depotdialog2&quot;).show();&#xD;
              }else{&#xD;
              $notify(&quot;请选择需要修改的仓库……&quot;);&#xD;
              }</ClientEvent>
          <Property name="caption">库存修改</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="width">100</Property>
          <Property name="iconClass">fa fa-pencil-square-o</Property>
        </ToolBarButton>
        <ToolBarButton>
          <Property name="caption">刷新缓存</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="iconClass">fa fa-refresh</Property>
          <Property name="width">100</Property>
          <Property name="action">ajaxRefreshCache</Property>
        </ToolBarButton>
      </ToolBar>
      <DataGrid id="dataGridDepot" layoutConstraint="padding:8">
        <ClientEvent name="onDataRowClick">view.get(&quot;#dataGridDepot&quot;).set(&quot;selection&quot;,arg.data);</ClientEvent>
        <Property name="dataSet">dataSetdepot</Property>
        <Property name="selectionMode">singleRow</Property>
        <Property name="readOnly">true</Property>
        <RowSelectorColumn/>
        <RowNumColumn/>
        <DataColumn name="id">
          <ClientEvent name="onRenderCell">renderId(arg);</ClientEvent>
          <Property name="property">id</Property>
          <Property name="align">center</Property>
          <Property name="width">120</Property>
        </DataColumn>
        <DataColumn name="name">
          <ClientEvent name="onRenderCell">renderName(arg);</ClientEvent>
          <Property name="property">name</Property>
          <Property name="align">center</Property>
          <Property name="width">120</Property>
        </DataColumn>
        <DataColumn name="deptId">
          <Property name="property">deptId</Property>
          <Property name="align">left</Property>
        </DataColumn>
        <DataColumn name="depotStatus">
          <Property name="property">depotStatus</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn name="foodVariety">
          <Property name="property">foodVariety</Property>
          <Property name="align">center</Property>
          <Property name="width">120</Property>
        </DataColumn>
        <DataColumn name="storageReal">
          <Property name="property">storageReal</Property>
          <Property name="align">center</Property>
          <Property name="width">150</Property>
        </DataColumn>
        <DataColumn name="foodYear">
          <Property name="property">foodYear</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="storeDate">
          <Property name="property">storeDate</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn name="storeKeeperName">
          <Property name="property">storeKeeperName</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn name="depotType">
          <Property name="property">depotType</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn name="updateTime">
          <Property name="property">updateTime</Property>
          <Property name="align">center</Property>
          <Property name="width">160</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Dialog id="depotdialog2" layout="regionPadding:8">
      <Property name="iconClass">fa fa-tasks</Property>
      <Property name="caption">仓库信息</Property>
      <Property name="width">80%</Property>
      <Property name="height">90%</Property>
      <Property name="closeable">false</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">//同时提交历史书&#xD;
              var data = view.get(&quot;#dataSetdepot.data:#&quot;);&#xD;
              view.get(&quot;#updateactionSave2&quot;).execute(function(result){&#xD;
              if(result){&#xD;
              $notify(result);&#xD;
              }else{&#xD;
              self.get(&quot;parent&quot;).hide();&#xD;
              query();&#xD;
              }&#xD;
              });</ClientEvent>
          <Property name="caption">保存</Property>
          <Property name="iconClass">fa fa-check-circle</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="width">120</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dataSetdepot.data:#&quot;);&#xD;
              if(cur) cur.cancel();&#xD;
              self.get(&quot;parent&quot;).hide();</ClientEvent>
          <Property name="caption">取消</Property>
          <Property name="exClassName">btn3</Property>
          <Property name="iconClass">fa fa-times-circle</Property>
          <Property name="width">120</Property>
        </Button>
      </Buttons>
      <Children>
        <FieldSet layout="padding:5">
          <Property name="caption">基本信息</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="dataSet">dataSetdepot</Property>
              <Property name="readOnly">false</Property>
              <Property name="labelSeparator"> : </Property>
              <Property name="labelAlign">right</Property>
              <Property name="cols">*,*,*,*,*,*</Property>
              <Property name="labelWidth">80</Property>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">id</Property>
                <Property name="property">id</Property>
                <Property name="readOnly">true</Property>
                <Editor>
                  <TextEditor>
                    <Property name="blankText">-- ç³»ç»Ÿè‡ªåŠ¨ç”Ÿæˆ --</Property>
                  </TextEditor>
                </Editor>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">name</Property>
                <Property name="property">name</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">deptId</Property>
                <Property name="property">deptId</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">storageMax</Property>
                <Property name="property">storageMax</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">storeType</Property>
                <Property name="property">storeType</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">depotStatus</Property>
                <Property name="property">depotStatus</Property>
                <Property name="trigger">autoMappingDropDown2</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">depotType</Property>
                <Property name="property">depotType</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">storeKeeperName</Property>
                <Property name="property">storeKeeperName</Property>
                <Property name="trigger">triggerUserList</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">orderNum</Property>
                <Property name="property">orderNum</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:4">
                <Property name="name">remark</Property>
                <Property name="property">remark</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">updateTime</Property>
                <Property name="property">updateTime</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
        <FieldSet layout="padding:5">
          <Property name="caption">储粮信息</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="dataSet">dataSetdepot</Property>
              <Property name="readOnly">false</Property>
              <Property name="labelSeparator"> : </Property>
              <Property name="labelAlign">right</Property>
              <Property name="cols">*,*,*,*,*,*</Property>
              <Property name="labelWidth">80</Property>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">storageReal</Property>
                <Property name="property">storageReal</Property>
                <Property name="readOnly">false</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">foodVariety</Property>
                <Property name="property">foodVariety</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">foodLevel</Property>
                <Property name="property">foodLevel</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">foodYear</Property>
                <Property name="property">foodYear</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">foodLocation</Property>
                <Property name="property">foodLocation</Property>
                <Property name="trigger">ddFoodOrigin</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">storeDate</Property>
                <Property name="property">storeDate</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
        <FieldSet layout="padding:5">
          <Property name="caption">其他信息</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="dataSet">dataSetdepot</Property>
              <Property name="readOnly">false</Property>
              <Property name="labelSeparator"> : </Property>
              <Property name="labelAlign">right</Property>
              <Property name="cols">*,*,*,*,*,*,*,*</Property>
              <Property name="labelWidth">100</Property>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">length</Property>
                <Property name="property">length</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">width</Property>
                <Property name="property">width</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">height</Property>
                <Property name="property">height</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">bulkWeight</Property>
                <Property name="property">bulkWeight</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">perWet</Property>
                <Property name="property">perWet</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">perImpurity</Property>
                <Property name="property">perImpurity</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">checkDate</Property>
                <Property name="property">checkDate</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="updateactionSave2">
      <Property name="executingMessage">正在执行中..</Property>
      <Property name="dataResolver">depotPR#saveOrUpdate2</Property>
      <UpdateItem>
        <Property name="dataSet">dataSetdepot</Property>
        <Property name="dataPath">[#current]</Property>
        <Property name="alias">data</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxRefreshCache">
      <Property name="service">depotPR#flushCache</Property>
      <Property name="successMessage">刷新成功！</Property>
      <Property name="confirmMessage">确定要刷新缓存么？</Property>
    </AjaxAction>
    <YearDropDown id="yearDropDown1"/>
    <DataSetDropDown id="triggerUserList">
      <Property name="dataSet">dataSetUser</Property>
      <Property name="property">userName</Property>
      <Property name="assignmentMap">storeKeeperName=userName,storeKeeper=loginName</Property>
    </DataSetDropDown>
    <CustomDropDown id="ddFoodOrigin">
      <Property name="minHeight">500</Property>
      <Property name="assignmentMap">foodLocation=name</Property>
      <Property name="minWidth">500</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsFoodOrigin">
          <Property name="dataProvider">dicAreaPR#pageList</Property>
          <Property name="parameter"></Property>
          <Property name="pageSize">30</Property>
          <Property name="dataType">[dtArea]</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>
    <ListDropDown id="listOri">
      <Property name="items">东,南,西,北,东北,东南,西南,西北</Property>
    </ListDropDown>
  </View>
</ViewConfig>

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

@@ -72,6 +72,7 @@
     */
    @DataResolver
    @Transactional
    @Log(title = "库存管理", businessType = BusinessType.UPDATE,bizType = BizTypeEnum.SYS)
    public String saveOrUpdate2(Depot data) {

        Depot depot = new Depot();
@@ -87,7 +88,7 @@
     */
    @Expose
    @Transactional
    @Log(title = "库区管理", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
    @Log(title = "仓库管理", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
    public void deleteDepot(Depot data) {
        Depot depot = new Depot();
        BeanUtils.copyProperties(data, depot);

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

@@ -4,6 +4,9 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <ClientEvent name="onDataChange">if(arg.property ==&quot;depotId&quot;){&#xD;
    autoByDepot(arg.newValue);&#xD;
}&#xD;</ClientEvent>
      <Property name="creationType">com.fzzy.igds.data.InoutData</Property>
      <PropertyDef name="id">
        <Property></Property>
@@ -315,6 +318,16 @@
      view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,TYPE).flushAsync();&#xD;
      };&#xD;
      flush();&#xD;
      &#xD;
      //根据仓库自动回填粮食品种，登记，产地新&#xD;
      autoByDepot = function(depotId){&#xD;
      view.get(&quot;#ajaxGetDepot&quot;).set(&quot;parameter&quot;,depotId).execute(function(result){&#xD;
      if(result){&#xD;
      var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
      data.set(&quot;foodVariety&quot;,result.foodVariety);&#xD;
      }&#xD;
      });&#xD;
      };&#xD;
      &#xD;
      /**&#xD;
      * æ•°æ®ä¿å­˜æäº¤&#xD;
@@ -950,5 +963,8 @@
      <Property name="async">true</Property>
      <Property name="confirmMessage">确定要删除么？</Property>
    </AjaxAction>
    <AjaxAction id="ajaxGetDepot">
      <Property name="service">depotPR#getDepot</Property>
    </AjaxAction>
  </View>
</ViewConfig>

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

@@ -4,6 +4,9 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <ClientEvent name="onDataChange">if(arg.property ==&quot;depotId&quot;){&#xD;
    autoByDepot(arg.newValue);&#xD;
}&#xD;</ClientEvent>
      <Property name="creationType">com.fzzy.igds.domain.InoutRecord</Property>
      <PropertyDef name="id">
        <Property></Property>
@@ -422,6 +425,16 @@
    }else{&#xD;
        $notify(&quot;请选择数据……&quot;);&#xD;
    }&#xD;
};&#xD;
&#xD;
//根据仓库自动回填粮食品种，登记，产地新&#xD;
autoByDepot = function(depotId){&#xD;
    view.get(&quot;#ajaxGetDepot&quot;).set(&quot;parameter&quot;,depotId).execute(function(result){&#xD;
        if(result){&#xD;
            var data = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
            data.set(&quot;foodVariety&quot;,result.foodVariety);&#xD;
        }&#xD;
    });&#xD;
};&#xD;
&#xD;
//异常执行&#xD;
@@ -1203,5 +1216,8 @@
      <Property name="service">inoutDataPR#analysisExcel</Property>
      <Property name="executingMessage">正在执行解析……</Property>
    </AjaxAction>
    <AjaxAction id="ajaxGetDepot">
      <Property name="service">depotPR#getDepot</Property>
    </AjaxAction>
  </View>
</ViewConfig>

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

@@ -38,7 +38,7 @@
      <Property name="dataProvider">companyPR#getCompanyByUserType</Property>
    </DataSet>
    <DataTree>
      <ClientEvent name="onDataRowDoubleClick">var curNode = self.get(&quot;currentNode&quot;);&#xD;
      <ClientEvent name="onDataRowClick">var curNode = self.get(&quot;currentNode&quot;);&#xD;
if(curNode.get(&quot;hasChild&quot;)){&#xD;
    curNode.expand();&#xD;
    $notify(&quot;请选择库区……&quot;);&#xD;

 fzzy-igdss-web/src/main/resources/application.yml

@@ -20,7 +20,7 @@
# Spring基础配置
spring:
  profiles:
    active: pro
    active: dev
  main:
    allow-bean-definition-overriding: true
  thymeleaf:

 fzzy-igdss-web/src/main/resources/static/inout/inout-check.js

@@ -35,6 +35,11 @@
            }
        });

        //监听仓库选择
        layui.form.on('select(depotId)', function (data) {
            updateDepot(data.value);
        });

        // åˆå§‹åŒ–表单数据
        renderTable();
    });
@@ -43,6 +48,25 @@
    showProgress();
});

//根据选择仓库显示粮食品种
function updateDepot(depotId) {
    var selectDepot;
    $.each(depot, function (index, data) {
        if (data.id === depotId) {
            selectDepot = data;
            return false;
        }
    });

    if (selectDepot) {
        form.val("form-detail", {
            foodVariety: selectDepot.foodVariety,
            foodLevel: selectDepot.foodLevel
        });
        form.render();
    }
}

/**
 * æŽ§åˆ¶æµç¨‹çŽ¯èŠ‚显示
 */

 fzzy-igdss-web/src/main/resources/static/inout/inout-weight.js

@@ -29,6 +29,12 @@
            }
        });


        //监听仓库选择,选择后自动调用仓库的粮食品种信息
        form.on('select(select_depotId)', function (obj) {
            updateFoodVarietyByDepot(obj.value);
        })

    });

    //显示流程环节
@@ -63,6 +69,24 @@
    });
};

//根据选择的仓库信息,更新粮食品种
function updateFoodVarietyByDepot(selectId) {
    var selectDepot;
    $.each(listDepot, function (index, data) {
        if (data.id === selectId) {
            selectDepot = data;
            return false;
        }
    });

    if (selectDepot) {
        form.val("form-data", {
            foodVariety: selectDepot.foodVariety
        });
        form.render();
    }
}

/**
 * ç§°é‡åŠæŠ“拍
 */

 fzzy-igdss-web/src/main/resources/static/inout/inout-weight2.js

@@ -42,6 +42,11 @@
            }
        });

        //监听仓库选择,选择后自动调用仓库的粮食品种信息
        form.on('select(select_depotId)', function (obj) {
            updateFoodVarietyByDepot(obj.value);
        })

        // åˆå§‹åŒ–表单数据
        renderTable();
    });
@@ -89,6 +94,24 @@
        "background": "#eff4f6"
    });
    layer.close(index);
}

//根据选择的仓库信息,更新粮食品种
function updateFoodVarietyByDepot(selectId) {
    var selectDepot;
    $.each(listDepot, function (index, data) {
        if (data.id === selectId) {
            selectDepot = data;
            return false;
        }
    });

    if (selectDepot) {
        form.val("form-data", {
            foodVariety: selectDepot.foodVariety
        });
        form.render();
    }
}

// æ¸²æŸ“表单数据
@@ -250,6 +273,8 @@
        area: ['1283px', '815px'],
        cancel: function (index, layero) {
            $("#weightDetail").css("display", "none");
            // åˆå§‹åŒ–表单数据
            renderTable();
        },
        shade: 0,
        scrollbar: 0,
@@ -281,6 +306,8 @@
        area: ['1283px', '815px'],
        cancel: function (index, layero) {
            $("#weightDetail").css("display", "none");
            // åˆå§‹åŒ–表单数据
            renderTable();
        },
        shade: 0,
        scrollbar: 0,
@@ -606,6 +633,7 @@
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(recordData),
        success: function (result) {
            layer.close(index);
            if (result.code != "0000") {
                alertError(result.msg);
            } else {
@@ -614,11 +642,13 @@
                notify("数据提交成功", result.data);
                //第一次称重后，刷新页面
                if (recordData.recordWeight <= 0.0) {
                    layer.closeAll();
                    // åˆå§‹åŒ–表单数据
                    renderTable();
                    $("#form-data")[0].reset();
                    form.render();
                }
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);

 fzzy-igdss-web/src/main/resources/templates/index-topnav.html

@@ -366,6 +366,7 @@
var dept = [[${dept}]];
var deptId = [[${deptId}]];
var showDeptList = [[${showDeptList}]];
var showDeptListTag = false;
if(lockscreen){window.top.location=ctx+"lockscreen";}
// çš®è‚¤ç¼“å­˜
var skin = storage.get("skin");
@@ -418,9 +419,13 @@
 * å¼¹å‡ºåˆ‡æ¢åº“区列表
 */
function showDepotAreaSelect() {
    if(showDeptListTag){
        return false;
    }
    if(showDeptList === "N"){
        return false;
    }
    showDeptListTag = true;
    layer.open({
        type: 2,
        title: '选择库区',
@@ -428,7 +433,9 @@
        offset: ['50px', '1350px'],
        shade: 0,
        content: "com.fzzy.igds.SelectDept.d",
        closeBtn: 1
        end: function(){ // å…³é—­å±‚后的回调
            showDeptListTag = false;
        }
    });
}


 fzzy-igdss-web/src/main/resources/templates/index.html

@@ -204,6 +204,7 @@
    var dept = [[${dept}]];
    var deptId = [[${deptId}]];
    var showDeptList = [[${showDeptList}]];
    var showDeptListTag = false;
    if (lockscreen) {
        window.top.location = ctx + "lockscreen";
    }
@@ -270,9 +271,13 @@
     * å¼¹å‡ºåˆ‡æ¢åº“区列表
     */
    function showDepotAreaSelect() {
        if(showDeptListTag){
            return false;
        }
        if(showDeptList === "N"){
            return false;
        }
        showDeptListTag = true;
        layer.open({
            type: 2,
            title: '选择库区',
@@ -280,7 +285,9 @@
            offset: ['50px', '1350px'],
            shade: 0,
            content: "com.fzzy.igds.SelectDept.d",
            closeBtn: 1
            end: function(){ // å…³é—­å±‚后的回调
                showDeptListTag = false;
            }
        });
    }


 fzzy-igdss-web/src/main/resources/templates/inout/check.html

@@ -296,6 +296,9 @@
    //所属分库
    var deptId = [[${deptId}]];

    //仓库信息
    var depot = [[${listDepot}]];

    var inoutProgress = [[${inoutProgress}]];

</script>
@@ -347,7 +350,7 @@
            <div class="layui-form-item">
                <label class="layui-form-label">装卸仓库</label>
                <div class="layui-input-block">
                    <select name="depotId" id="depotId" lay-filter="select_depot">
                    <select name="depotId" id="depotId" lay-filter="depotId">
                        <option value=""></option>
                        <option th:each="depot,depotSet:${listDepot}"
                                th:value="${depot.id}" th:text="${depot.name}"></option>
@@ -368,7 +371,7 @@
            <div class="layui-form-item">
                <label class="layui-form-label">往来单位</label>
                <div class="layui-input-block">
                    <select name="depotId" id="customerName" lay-filter="select_depot">
                    <select name="customerName" id="customerName" lay-filter="select_depot">
                    </select>
                </div>
            </div>
@@ -388,7 +391,7 @@
        </div>
        <div class="layui-col-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label red">粮食等级</label>
                <label class="layui-form-label">粮食等级</label>
                <div class="layui-input-block">
                    <select id="foodLevel" name="foodLevel" lay-filter="select_foodLevel">
                        <option value=""></option>

 fzzy-igdss-web/src/main/resources/templates/inout/weight2.html

@@ -205,7 +205,7 @@
                            <div class="layui-col-xs4 layui-text-right">
                                <input type="button" style="border-radius: 50px;background-color: #1c84c6 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="搜索" class="qyzj-top-btn layui-btn btn-blue" onclick="flushData()"/>
                                <input type="button" style="border-radius: 50px;background-color: #f8ac59 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="重置" class="qyzj-top-btn layui-btn btn-red" onclick="resetForm()"/>
                                <input type="button" style="border-radius: 50px;background-color: #1ab394 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="登记" class="qyzj-top-btn layui-btn btn-group" onclick="quickRegister()"/>
                                <input type="button" style="border-radius: 50px;background-color: #1ab394 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="称重" class="qyzj-top-btn layui-btn btn-group" onclick="quickRegister()"/>
                            </div>

                        </form>

 fzzy-igdss-web/src/main/resources/templates/system/user/add.html

@@ -100,7 +100,7 @@
                    </div>
                </div>
            </div>
            <div class="row">
            <div class="row" style="display: none">
                <div class="col-sm-6">
                    <div class="form-group">
                        <label class="col-sm-4 control-label">岗位：</label>

 fzzy-igdss-web/src/main/resources/templates/system/user/edit.html

@@ -77,13 +77,14 @@
                </div>
            </div>
            <div class="row">

                <div class="col-sm-6">
                    <div class="form-group">
                        <label class="col-sm-4 control-label">岗位：</label>
                        <label class="col-sm-4 control-label">角色：</label>
                        <div class="col-sm-8">
                            <select id="post" class="form-control select2-multiple" multiple>
                                <option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:selected="${post.flag}" th:disabled="${post.status == '1'}"></option>
                            </select>
                            <label th:each="role:${roles}" class="check-box">
                                <input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:checked="${role.flag}" th:disabled="${role.status == '1'}">
                            </label>
                        </div>
                    </div>
                </div>
@@ -98,14 +99,14 @@
                    </div>
                </div>
            </div>
            <div class="row">
            <div class="row" style="display: none">
                <div class="col-sm-6">
                    <div class="form-group">
                        <label class="col-sm-4 control-label">角色：</label>
                        <label class="col-sm-4 control-label">岗位：</label>
                        <div class="col-sm-8">
                            <label th:each="role:${roles}" class="check-box">
                                <input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:checked="${role.flag}" th:disabled="${role.status == '1'}">
                            </label>
                            <select id="post" class="form-control select2-multiple" multiple>
                                <option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:selected="${post.flag}" th:disabled="${post.status == '1'}"></option>
                            </select>
                        </div>
                    </div>
                </div>