Merge remote-tracking branch 'origin/master'

CZT

2023-10-24 f27f3ea5055888f7f1c797d0fd7fb26a2013c89c

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

@@ -49,6 +49,7 @@
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="depotIdIn">
        <Property></Property>
@@ -73,11 +74,13 @@
      <PropertyDef name="changeDate">
        <Property name="dataType">Date</Property>
        <Property name="label">倒仓日期</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="number">
        <Property name="dataType">Double</Property>
        <Property name="label">倒仓数量</Property>
        <Property name="displayFormat">#.00</Property>
        <Property name="displayFormat">#,##0.00 KG</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
@@ -87,16 +90,8 @@
        <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></Property>
        <Property name="label">包装物</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;stockChangePR#triggerBzw&quot;).getResult()}</Property>
@@ -104,17 +99,12 @@
          <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></Property>
        <Property name="label">装卸作业单位</Property>
      </PropertyDef>
    </DataType>
@@ -178,6 +168,8 @@
        <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
if(data){&#xD;
   view.get(&quot;#dialogMain&quot;).show();&#xD;
}else{&#xD;
   $alert(&quot;请勾选需要修改的数据！&quot;);&#xD;
}</ClientEvent>
        <Property name="caption">调整</Property>
        <Property name="exClassName">btn-warm</Property>
@@ -306,11 +298,10 @@
      </DataPilot>
    </Container>
    <Dialog id="dialogMain" layout="padding:5;regionPadding:10">
      <Property name="width">60%</Property>
      <Property name="width">70%</Property>
      <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;
@@ -346,8 +337,8 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">companyId</Property>
            <Property name="property">companyId</Property>
            <Property name="name">deptId</Property>
            <Property name="property">deptId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -361,29 +352,8 @@
            <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>