Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-06-21 d8047152e563ba7816208a3fe9cf1ffdc9cddc83

 igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml

@@ -7,11 +7,13 @@
      <Property name="creationType">com.ld.igds.models.InoutStockChange</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">ID</Property>
        <Property name="label">倒仓单号</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">组织编码</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="deptId">
        <Property></Property>
@@ -75,15 +77,45 @@
      <PropertyDef name="number">
        <Property name="dataType">Double</Property>
        <Property name="label">倒仓数量</Property>
        <Property name="displayFormat">#.00KG</Property>
        <Property name="displayFormat">#.00</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
        <Property name="label">更新时间</Property>
        <Property name="label">最后更新时间</Property>
      </PropertyDef>
      <PropertyDef name="updateUser">
        <Property></Property>
        <Property name="label">更新人</Property>
      </PropertyDef>
      <PropertyDef name="dchwdm">
        <Property/>
        <Property name="label">倒出货位代码</Property>
      </PropertyDef>
      <PropertyDef name="drhwdm">
        <Property/>
        <Property name="label">倒入货位代码</Property>
      </PropertyDef>
      <PropertyDef name="bzw">
        <Property/>
        <Property name="label">包装物</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;stockChangePR#triggerBzw&quot;).getResult()}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property/>
        <Property name="label">操作标志</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="bzbjs">
        <Property name="dataType">Integer</Property>
        <Property name="label">标准包件数</Property>
      </PropertyDef>
      <PropertyDef name="zxzydw">
        <Property/>
        <Property name="label">装卸作业单位</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
@@ -174,6 +206,7 @@
        <Property name="caption">刷新</Property>
        <Property name="exClassName">btn-default</Property>
        <Property name="iconClass">fa fa-refresh</Property>
        <Property name="visible">false</Property>
      </Button>
    </Container>
    <Container layout="regionPadding:10" layoutConstraint="center">
@@ -277,6 +310,7 @@
      <Property name="caption">详细信息</Property>
      <Property name="iconClass">fa fa-flag-o</Property>
      <Property name="closeable">false</Property>
      <Property name="height">80%</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
@@ -307,6 +341,16 @@
          <Property name="labelAlign">right</Property>
          <Property name="labelSeparator">：</Property>
          <AutoFormElement>
            <Property name="name">id</Property>
            <Property name="property">id</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">companyId</Property>
            <Property name="property">companyId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">depotIdIn</Property>
            <Property name="property">depotIdIn</Property>
            <Editor/>
@@ -317,8 +361,29 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">deptId</Property>
            <Property name="property">deptId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">type</Property>
            <Property name="property">type</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dchwdm</Property>
            <Property name="property">dchwdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">drhwdm</Property>
            <Property name="property">drhwdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -347,9 +412,18 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateTime</Property>
            <Property name="property">updateTime</Property>
            <Property name="readOnly">true</Property>
            <Property name="name">bzw</Property>
            <Property name="property">bzw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bzbjs</Property>
            <Property name="property">bzbjs</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zxzydw</Property>
            <Property name="property">zxzydw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -358,6 +432,12 @@
            <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateTime</Property>
            <Property name="property">updateTime</Property>
            <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>