增加Modbus协议：温控控制

CZT

2023-08-30 a3f8ef130d998973a5d36bb196e1607827de81e8

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

@@ -41,8 +41,8 @@
      </PropertyDef>
      <PropertyDef name="foodVariety">
        <Property></Property>
        <Property name="label">变更前品种</Property>
        <Property name="required">false</Property>
        <Property name="label">粮食品种</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
@@ -52,7 +52,7 @@
      <PropertyDef name="foodType">
        <Property></Property>
        <Property name="label">变更前性质</Property>
        <Property name="required">false</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
@@ -62,7 +62,7 @@
      <PropertyDef name="newFoodType">
        <Property></Property>
        <Property name="label">变更后性质</Property>
        <Property name="required">false</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
@@ -73,13 +73,15 @@
        <Property></Property>
        <Property name="label">粮食数量</Property>
        <Property name="dataType">Double</Property>
        <Property name="displayFormat">#,##0.00 kG</Property>
        <Property name="displayFormat">#,##0.00 KG</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="changeNumber">
        <Property></Property>
        <Property name="label">划转数量</Property>
        <Property name="dataType">Double</Property>
        <Property name="displayFormat">#,##0.00 kG</Property>
        <Property name="displayFormat">#,##0.00 KG</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="changeTime">
        <Property name="dataType">Date</Property>
@@ -94,73 +96,65 @@
        <Property></Property>
        <Property name="label">备注</Property>
      </PropertyDef>
      <PropertyDef name="hwdm">
        <Property/>
        <Property name="label">货位代码</Property>
      </PropertyDef>
      <PropertyDef name="ccshr">
        <Property/>
        <Property></Property>
        <Property name="label">仓储审核人</Property>
      </PropertyDef>
      <PropertyDef name="auditCcsh">
        <Property/>
        <Property></Property>
        <Property name="label">审批状态</Property>
      </PropertyDef>
      <PropertyDef name="InfoCcsh">
        <Property/>
        <Property></Property>
        <Property name="label">审核说明</Property>
      </PropertyDef>
      <PropertyDef name="zjshr">
        <Property/>
        <Property></Property>
        <Property name="label">质检审核人</Property>
      </PropertyDef>
      <PropertyDef name="auditZjsh">
        <Property/>
        <Property></Property>
        <Property name="label">审批状态</Property>
      </PropertyDef>
      <PropertyDef name="infoZjsh">
        <Property/>
        <Property></Property>
        <Property name="label">审核说明</Property>
      </PropertyDef>
      <PropertyDef name="tjshr">
        <Property/>
        <Property></Property>
        <Property name="label">统计审核人</Property>
      </PropertyDef>
      <PropertyDef name="auditTjsh">
        <Property/>
        <Property></Property>
        <Property name="label">审批状态</Property>
      </PropertyDef>
      <PropertyDef name="infoTjsh">
        <Property/>
        <Property></Property>
        <Property name="label">审核说明</Property>
      </PropertyDef>
      <PropertyDef name="kjshr">
        <Property/>
        <Property></Property>
        <Property name="label">会计审核人</Property>
      </PropertyDef>
      <PropertyDef name="auditKjsh">
        <Property/>
        <Property></Property>
        <Property name="label">审批状态</Property>
      </PropertyDef>
      <PropertyDef name="infoKjsh">
        <Property/>
        <Property></Property>
        <Property name="label">审核说明</Property>
      </PropertyDef>
      <PropertyDef name="ldshr">
        <Property/>
        <Property></Property>
        <Property name="label">领导审核人</Property>
      </PropertyDef>
      <PropertyDef name="auditLdsh">
        <Property/>
        <Property></Property>
        <Property name="label">审批状态</Property>
      </PropertyDef>
      <PropertyDef name="infoLdsh">
        <Property/>
        <Property></Property>
        <Property name="label">审核说明</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property/>
        <Property name="label">操作标志</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
@@ -299,6 +293,12 @@
        <Property name="dataSet">dsMain</Property>
        <Property name="readOnly">true</Property>
        <RowNumColumn/>
        <DataColumn>
          <Property name="align">center</Property>
          <Property name="name">id</Property>
          <Property name="property">id</Property>
          <Editor/>
        </DataColumn>
        <DataColumn name="depotId">
          <Property name="property">depotId</Property>
          <Property name="align">center</Property>
@@ -328,7 +328,7 @@
      </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>
@@ -372,23 +372,23 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">depotId</Property>
                <Property name="property">depotId</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">companyId</Property>
                <Property name="property">companyId</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">approvalId</Property>
                <Property name="property">approvalId</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">hwdm</Property>
                <Property name="property">hwdm</Property>
                <Property name="name">deptId</Property>
                <Property name="property">deptId</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">depotId</Property>
                <Property name="property">depotId</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">changeTime</Property>
                <Property name="property">changeTime</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -417,24 +417,9 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">changeTime</Property>
                <Property name="property">changeTime</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">updateTime</Property>
                <Property name="property">updateTime</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">czbz</Property>
                <Property name="property">czbz</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">deptId</Property>
                <Property name="property">deptId</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
@@ -453,7 +438,7 @@
                  <Property name="dataSet">dsMain</Property>
                  <Property name="labelAlign">right</Property>
                  <Property name="labelSeparator">:</Property>
                  <Property name="labelWidth">120</Property>
                  <Property name="labelWidth">100</Property>
                  <AutoFormElement>
                    <Property name="name">ccshr</Property>
                    <Property name="property">ccshr</Property>
@@ -481,7 +466,7 @@
                  <Property name="dataSet">dsMain</Property>
                  <Property name="labelAlign">right</Property>
                  <Property name="labelSeparator">:</Property>
                  <Property name="labelWidth">120</Property>
                  <Property name="labelWidth">100</Property>
                  <AutoFormElement>
                    <Property name="name">zjshr</Property>
                    <Property name="property">zjshr</Property>
@@ -507,7 +492,7 @@
                <AutoForm>
                  <Property name="cols">*,*</Property>
                  <Property name="dataSet">dsMain</Property>
                  <Property name="labelWidth">120</Property>
                  <Property name="labelWidth">100</Property>
                  <Property name="labelSeparator">:</Property>
                  <Property name="labelAlign">right</Property>
                  <AutoFormElement>
@@ -537,7 +522,7 @@
                  <Property name="dataSet">dsMain</Property>
                  <Property name="labelAlign">right</Property>
                  <Property name="labelSeparator">:</Property>
                  <Property name="labelWidth">120</Property>
                  <Property name="labelWidth">100</Property>
                  <AutoFormElement>
                    <Property name="name">kjshr</Property>
                    <Property name="property">kjshr</Property>
@@ -565,7 +550,7 @@
                  <Property name="dataSet">dsMain</Property>
                  <Property name="labelAlign">right</Property>
                  <Property name="labelSeparator">:</Property>
                  <Property name="labelWidth">140</Property>
                  <Property name="labelWidth">100</Property>
                  <AutoFormElement>
                    <Property name="name">ldshr</Property>
                    <Property name="property">ldshr</Property>
@@ -595,7 +580,7 @@
              <Property name="dataSet">dsMain</Property>
              <Property name="labelAlign">right</Property>
              <Property name="labelSeparator">:</Property>
              <Property name="labelWidth">120</Property>
              <Property name="labelWidth">100</Property>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">remark</Property>
                <Property name="property">remark</Property>