YYC
2023-08-02 bdc3fdfe30373edbb29c778b856794d2c0fead45
问题修改
已修改5个文件
78 ■■■■■ 文件已修改
igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-recir/src/main/java/com/ld/igds/models/DrugLog.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml
@@ -73,18 +73,23 @@
      <PropertyDef name="rkjz">
        <Property name="dataType">double</Property>
        <Property name="label">入库净重</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000KG</Property>
      </PropertyDef>
      <PropertyDef name="rksj">
        <Property name="dataType">Date</Property>
        <Property name="label">入库时间</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="rksf">
        <Property name="dataType">double</Property>
        <Property name="label">入库水分(%)</Property>
        <Property name="label">入库水分</Property>
        <Property name="displayFormat">#0.000%</Property>
      </PropertyDef>
      <PropertyDef name="rkzz">
        <Property name="dataType">double</Property>
        <Property name="label">入库杂质(%)</Property>
        <Property name="label">入库杂质</Property>
        <Property name="displayFormat">#0.000%</Property>
      </PropertyDef>
      <PropertyDef name="cksj">
        <Property name="dataType">Date</Property>
@@ -93,14 +98,17 @@
      <PropertyDef name="ckjz">
        <Property name="dataType">double</Property>
        <Property name="label">出库净重</Property>
        <Property name="displayFormat">#0.000KG</Property>
      </PropertyDef>
      <PropertyDef name="cksf">
        <Property name="dataType">double</Property>
        <Property name="label">出库水分(%)</Property>
        <Property name="label">出库水分</Property>
        <Property name="displayFormat">#0.000%</Property>
      </PropertyDef>
      <PropertyDef name="ckzz">
        <Property name="dataType">double</Property>
        <Property name="label">出库杂质(%)</Property>
        <Property name="label">出库杂质</Property>
        <Property name="displayFormat">#0.000%</Property>
      </PropertyDef>
      <PropertyDef name="sysfzc">
        <Property></Property>
@@ -110,10 +118,12 @@
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="syyy">
        <Property></Property>
        <Property name="label">损溢原因</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="ccshr">
        <Property></Property>
@@ -507,7 +517,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>
@@ -535,7 +545,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>
@@ -561,7 +571,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>
@@ -591,7 +601,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>
@@ -619,7 +629,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>
@@ -649,7 +659,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>
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>
@@ -79,6 +80,7 @@
        <Property name="dataType">Double</Property>
        <Property name="label">倒仓数量</Property>
        <Property name="displayFormat">#,##0.00 KG</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
@@ -363,12 +365,6 @@
          <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>
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>
@@ -74,12 +74,14 @@
        <Property name="label">粮食数量</Property>
        <Property name="dataType">Double</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="required">true</Property>
      </PropertyDef>
      <PropertyDef name="changeTime">
        <Property name="dataType">Date</Property>
@@ -440,11 +442,6 @@
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">czbz</Property>
                <Property name="property">czbz</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
@@ -461,7 +458,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>
@@ -489,7 +486,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>
@@ -515,7 +512,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>
@@ -545,7 +542,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>
@@ -573,7 +570,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>
@@ -603,7 +600,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>
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
@@ -133,7 +133,7 @@
        <Property name="label">粮堆使用剂量</Property>
        <Property name="displayFormat">##0.000g/m³</Property>
      </PropertyDef>
      <PropertyDef name="SpaceDose">
      <PropertyDef name="spaceDose">
        <Property name="dataType">Double</Property>
        <Property name="label">空间使用剂量</Property>
        <Property name="displayFormat">##0.000g/m³</Property>
@@ -530,6 +530,11 @@
          <Property name="property">end</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">drugName</Property>
          <Property name="align">center</Property>
          <Property name="name">drugName</Property>
        </DataColumn>
        <DataColumn name="user">
          <Property name="property">user</Property>
          <Property name="align">center</Property>
@@ -693,8 +698,8 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">SpaceDose</Property>
            <Property name="property">SpaceDose</Property>
            <Property name="name">spaceDose</Property>
            <Property name="property">spaceDose</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
@@ -113,7 +113,7 @@
    @Column(name = "SPACE_DOSE_")
    @PropertyDef(label = "空间单位用药量", description = "g/m³")
    private Double SpaceDose = 0.0;
    private Double spaceDose = 0.0;
    @Column(name = "DOSE_")
    @PropertyDef(label = "总用药量", description = "kg")