代码合并修改

sgj

2026-01-17 f0287da5142c604f774096c458dab2156c0fe7c1

代码合并修改

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

@@ -99,7 +99,6 @@
        <Property name="label">完成数量</Property>
        <Property name="displayFormat">#0.0 KG</Property>
      </PropertyDef>
<<<<<<< HEAD
      <PropertyDef name="auditStatus">
        <Property></Property>
        <Property name="label">审核状态</Property>
@@ -108,7 +107,7 @@
          <Property name="keyProperty">dictValue</Property>
          <Property name="valueProperty">dictLabel</Property>
        </Property>
=======
      </PropertyDef>
      <PropertyDef name="auditUser">
        <Property></Property>
        <Property name="label">审核人</Property>
@@ -116,7 +115,6 @@
      <PropertyDef name="auditDate">
        <Property name="dataType">DateTime</Property>
        <Property name="label">审批时间</Property>
>>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
      </PropertyDef>
      <PropertyDef name="completeStatus">
        <Property></Property>
@@ -513,10 +511,7 @@
              <Property name="property">type</Property>
              <Property name="trigger">autoMappingDropDown1</Property>
              <Property name="editorType">RadioGroup</Property>
<<<<<<< HEAD
              <Property name="showHint">false</Property>
=======
>>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
              <Editor/>
            </AutoFormElement>
            <AutoFormElement id="formItemBank">
@@ -554,19 +549,16 @@
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
<<<<<<< HEAD
              <Property name="name">customerName</Property>
              <Property name="property">customerName</Property>
=======
              <Property name="name">targetNumber</Property>
              <Property name="property">targetNumber</Property>
              <Property name="readOnly">false</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">unitName</Property>
              <Property name="property">unitName</Property>
>>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
              <Property name="name">targetNumber</Property>
              <Property name="property">targetNumber</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
@@ -577,23 +569,6 @@
            <AutoFormElement>
              <Property name="name">createTime</Property>
              <Property name="property">createTime</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement layoutConstraint="colSpan:3">
              <Property name="name">remark</Property>
              <Property name="property">remark</Property>
              <Property name="editorType">TextArea</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">createBy</Property>
              <Property name="property">createBy</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">createTime</Property>
              <Property name="property">createTime</Property>
              <Property name="readOnly">true</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement layoutConstraint="colSpan:3">
@@ -633,21 +608,6 @@
            <AutoFormElement>
              <Property name="name">auditStatus</Property>
              <Property name="property">auditStatus</Property>
<<<<<<< HEAD
=======
              <Property name="readOnly">true</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">auditUser</Property>
              <Property name="property">auditUser</Property>
              <Property name="readOnly">true</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">auditDate</Property>
              <Property name="property">auditDate</Property>
>>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
              <Property name="readOnly">true</Property>
              <Editor/>
            </AutoFormElement>