优化通知单和设备，分库区

CZT

2023-11-03 1650011c3b469e0685b4013b9dc1fd14bc6550f7

 igds-inout/src/main/java/models/inout.model.xml

@@ -78,6 +78,7 @@
        <Property name="valueProperty">name</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="khlx">
      <Property></Property>
@@ -87,10 +88,12 @@
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="khbh">
      <Property></Property>
      <Property name="label">客户编码</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="fddbr">
      <Property></Property>
@@ -453,24 +456,70 @@
      <Property></Property>
      <Property name="label">组织编码</Property>
    </PropertyDef>
    <PropertyDef name="deptId">
      <Property></Property>
      <Property name="label">库区编码</Property>
    </PropertyDef>
    <PropertyDef name="inoutType">
      <Property></Property>
      <Property name="label">出入库类型</Property>
    </PropertyDef>
    <PropertyDef name="bizType">
      <Property></Property>
      <Property name="label">处理方式</Property>
    </PropertyDef>
    <PropertyDef name="depotId">
      <Property></Property>
      <Property name="label">所属仓库</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="contractId">
      <Property></Property>
      <Property name="label">合同编码</Property>
    </PropertyDef>
    <PropertyDef name="contractName">
      <Property></Property>
      <Property name="label">合同名称</Property>
    </PropertyDef>
    <PropertyDef name="payPrice">
      <Property name="dataType">Double</Property>
      <Property name="label">粮食单价</Property>
      <Property name="displayFormat">0.000 元/公斤</Property>
    </PropertyDef>
    <PropertyDef name="paySum">
    <PropertyDef name="payMoney">
      <Property name="dataType">Double</Property>
      <Property name="label">结算总额</Property>
      <Property name="displayFormat">￥0.00</Property>
    </PropertyDef>
    <PropertyDef name="settleWeight">
      <Property name="dataType">Double</Property>
      <Property name="label">结算重量</Property>
      <Property name="displayFormat">0 KG</Property>
    </PropertyDef>
    <PropertyDef name="payTime">
      <Property name="dataType">DateTime</Property>
      <Property name="label">结算时间</Property>
    </PropertyDef>
    <PropertyDef name="payType">
      <Property></Property>
      <Property name="label">付款方式</Property>
      <Property name="label">结算方式</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;PAY_TYPE&quot;)}</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;inoutSettlePR#triggerPayType&quot;).getResult()}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="payee">
      <Property></Property>
      <Property name="label">收款人</Property>
    </PropertyDef>
    <PropertyDef name="payeeId">
      <Property></Property>
      <Property name="label">收款人省份证号</Property>
    </PropertyDef>
    <PropertyDef name="bank">
      <Property></Property>
@@ -480,60 +529,29 @@
      <Property></Property>
      <Property name="label">银行卡号</Property>
    </PropertyDef>
    <PropertyDef name="payUnit">
      <Property></Property>
      <Property name="label">付款单位</Property>
    </PropertyDef>
    <PropertyDef name="payUser">
      <Property></Property>
      <Property name="label">结算人</Property>
    </PropertyDef>
    <PropertyDef name="payTime">
      <Property name="dataType">DateTime</Property>
      <Property name="label">结算时间</Property>
    </PropertyDef>
    <PropertyDef name="settleWeight">
      <Property name="dataType">Double</Property>
      <Property name="label">结算重量</Property>
      <Property name="displayFormat">0 KG</Property>
    </PropertyDef>
    <PropertyDef name="fullWeight">
      <Property name="dataType">Double</Property>
      <Property name="label">毛重</Property>
      <Property name="displayFormat">0 KG</Property>
    </PropertyDef>
    <PropertyDef name="emptyWeight">
      <Property name="dataType">Double</Property>
      <Property name="label">皮重</Property>
      <Property name="displayFormat">0 KG</Property>
    </PropertyDef>
    <PropertyDef name="netWeight">
      <Property name="dataType">Double</Property>
      <Property name="label">净重</Property>
      <Property name="displayFormat">0 KG</Property>
    </PropertyDef>
    <PropertyDef name="deSum">
      <Property name="dataType">Double</Property>
      <Property name="label">总扣重</Property>
      <Property name="displayFormat">0 KG</Property>
    </PropertyDef>
    <PropertyDef name="type">
      <Property></Property>
      <Property name="label">出入库类型</Property>
    </PropertyDef>
    <PropertyDef name="customerId">
      <Property></Property>
      <Property name="label">客户编码</Property>
    </PropertyDef>
    <PropertyDef name="customerName">
      <Property></Property>
      <Property name="label">客户名称</Property>
    </PropertyDef>
    <PropertyDef name="otherSum">
      <Property></Property>
      <Property name="label">其他扣费</Property>
      <Property name="dataType">Double</Property>
      <Property name="displayFormat">￥0.00</Property>
    </PropertyDef>
    <PropertyDef name="remarks">
      <Property></Property>
      <Property name="label">备注信息</Property>
    </PropertyDef>
    <PropertyDef name="updateTime">
      <Property name="dataType">Date</Property>
      <Property name="label">数据更新时间</Property>
    </PropertyDef>
    <PropertyDef name="bankCategory">
      <Property/>
      <Property name="label">银行行别代码</Property>
    </PropertyDef>
    <PropertyDef name="bankCode">
      <Property/>
      <Property name="label">开户行号</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtNoticeDto">
@@ -554,6 +572,12 @@
    </PropertyDef>
    <PropertyDef name="depotId">
      <Property></Property>
      <Property name="label">所涉仓库</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="customerId">
      <Property></Property>
@@ -564,12 +588,19 @@
    </PropertyDef>
    <PropertyDef name="foodVariety">
      <Property></Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="label">粮食品种</Property>
    </PropertyDef>
    <PropertyDef name="foodType">
      <Property></Property>
    </PropertyDef>
    <PropertyDef name="year">
      <Property></Property>
      <Property name="label">年份</Property>
    </PropertyDef>
    <PropertyDef name="targetNumber">
      <Property name="dataType">double</Property>
@@ -580,5 +611,12 @@
    <PropertyDef name="completeTime">
      <Property name="dataType">Date</Property>
    </PropertyDef>
    <PropertyDef name="unitName">
      <Property></Property>
    </PropertyDef>
    <PropertyDef name="contractName">
      <Property></Property>
      <Property name="label">所属合同</Property>
    </PropertyDef>
  </DataType>
</Model>