优化贝博粮情协议-星仓补点问题

CZT

2023-10-08 ae81799a3b2a89d56280ee53db7f6789cb7842f9

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

@@ -9,7 +9,7 @@
    </PropertyDef>
    <PropertyDef name="type">
      <Property></Property>
      <Property name="label">客户类型</Property>
      <Property name="label">业务分类</Property>
      <Property name="mapping">
        <Property name="mapValues">
          <Collection>
@@ -34,12 +34,12 @@
    </PropertyDef>
    <PropertyDef name="name">
      <Property></Property>
      <Property name="label">单位名名称</Property>
      <Property name="label">客户名称</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="cardId">
      <Property></Property>
      <Property name="label">身份证号</Property>
      <Property name="label">联系人身份证号</Property>
    </PropertyDef>
    <PropertyDef name="address">
      <Property></Property>
@@ -56,6 +56,11 @@
    <PropertyDef name="bank">
      <Property></Property>
      <Property name="label">开户银行</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;KHKHH&quot;)}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="bankNum">
      <Property></Property>
@@ -68,6 +73,40 @@
    <PropertyDef name="deptId">
      <Property></Property>
      <Property name="label">所属分库</Property>
      <Property name="mapping">
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="khlx">
      <Property></Property>
      <Property name="label">客户类型</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;contractManagePR#triggerCustomerType&quot;).getResult()}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="khbh">
      <Property></Property>
      <Property name="label">客户编码</Property>
    </PropertyDef>
    <PropertyDef name="fddbr">
      <Property></Property>
      <Property name="label">法定代表人</Property>
    </PropertyDef>
    <PropertyDef name="yzbm">
      <Property></Property>
      <Property name="label">邮政编码</Property>
    </PropertyDef>
    <PropertyDef name="dzyx">
      <Property></Property>
      <Property name="label">电子信箱</Property>
    </PropertyDef>
    <PropertyDef name="updateTime">
      <Property name="dataType">Date</Property>
      <Property name="label">数据更新时间</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtInoutRecord">
@@ -156,14 +195,6 @@
      <Property></Property>
      <Property name="label">运输方式</Property>
    </PropertyDef>
    <PropertyDef name="specType">
      <Property></Property>
      <Property name="label">规格</Property>
    </PropertyDef>
    <PropertyDef name="customerId">
      <Property></Property>
      <Property name="label">往来单位ID</Property>
    </PropertyDef>
    <PropertyDef name="customerName">
      <Property></Property>
      <Property name="label">往来单位</Property>
@@ -178,26 +209,6 @@
      <Property name="label">粮食年份</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="impurity">
      <Property name="dataType">Double</Property>
      <Property name="label">杂质</Property>
      <Property name="displayFormat">0.00 %</Property>
    </PropertyDef>
    <PropertyDef name="wet">
      <Property name="dataType">Double</Property>
      <Property name="label">水分</Property>
      <Property name="displayFormat">0.00 %</Property>
    </PropertyDef>
    <PropertyDef name="deImpurity">
      <Property name="dataType">Double</Property>
      <Property name="label">杂质扣重</Property>
      <Property name="displayFormat">0.0 KG</Property>
    </PropertyDef>
    <PropertyDef name="deWet">
      <Property name="dataType">Double</Property>
      <Property name="label">水分增重</Property>
      <Property name="displayFormat">0.0 KG</Property>
    </PropertyDef>
    <PropertyDef name="deHandle">
      <Property name="dataType">Double</Property>
      <Property name="label">值仓扣重</Property>
@@ -206,11 +217,6 @@
    <PropertyDef name="deOther">
      <Property name="dataType">Double</Property>
      <Property name="label">其他扣重</Property>
      <Property name="displayFormat">0.0 KG</Property>
    </PropertyDef>
    <PropertyDef name="deSum">
      <Property name="dataType">Double</Property>
      <Property name="label">总扣重</Property>
      <Property name="displayFormat">0.0 KG</Property>
    </PropertyDef>
    <PropertyDef name="fullWeight">
@@ -271,7 +277,7 @@
    </PropertyDef>
    <PropertyDef name="completeTime">
      <Property name="dataType">DateTime</Property>
      <Property name="label">完成时间</Property>
      <Property name="label">离库时间</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="completeUser">
@@ -336,7 +342,7 @@
    </PropertyDef>
    <PropertyDef name="foodLevel">
      <Property></Property>
      <Property name="label">粮食等级</Property>
      <Property name="label">粮食定等</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
        <Property name="keyProperty">code</Property>
@@ -345,23 +351,16 @@
    </PropertyDef>
    <PropertyDef name="checkUser">
      <Property></Property>
      <Property name="label">化验人</Property>
      <Property name="label">质检人</Property>
    </PropertyDef>
    <PropertyDef name="checkId">
      <Property></Property>
      <Property name="label">化验单号</Property>
    </PropertyDef>
    <PropertyDef name="curStorage">
      <Property name="dataType">double</Property>
      <Property name="label">当前库存</Property>
    </PropertyDef>
    <PropertyDef name="price">
      <Property name="dataType">double</Property>
      <Property name="label">单价</Property>
    </PropertyDef>
    <PropertyDef name="settleMoney">
      <Property name="dataType">double</Property>
      <Property name="label">结算金额</Property>
      <Property name="label">粮食定价</Property>
      <Property name="displayFormat">#.00 元/公斤</Property>
    </PropertyDef>
    <PropertyDef name="foodType">
      <Property></Property>
@@ -371,21 +370,77 @@
      <Property></Property>
      <Property name="label">通知单编码</Property>
    </PropertyDef>
    <PropertyDef name="noticeName">
      <Property></Property>
      <Property name="label">通知单</Property>
    </PropertyDef>
    <PropertyDef name="price">
      <Property name="dataType">Double</Property>
      <Property name="label">单价</Property>
      <Property name="displayFormat">#.00 元/公斤</Property>
    </PropertyDef>
    <PropertyDef name="settleTag">
      <Property></Property>
      <Property name="label">是否结算</Property>
    </PropertyDef>
    <PropertyDef name="remarks">
      <Property name="label">备注说明</Property>
    </PropertyDef>
    <PropertyDef name="foodLocationId">
      <Property></Property>
      <Property name="label">产地名称代码</Property>
    </PropertyDef>
    <PropertyDef name="checkTime">
      <Property name="dataType">Date</Property>
      <Property name="label">质检时间</Property>
    </PropertyDef>
    <PropertyDef name="sampleUser">
      <Property></Property>
      <Property name="label">扦样人</Property>
    </PropertyDef>
    <PropertyDef name="sampleTime">
      <Property name="dataType">Date</Property>
      <Property name="label">扦样时间</Property>
    </PropertyDef>
    <PropertyDef name="sampleType">
      <Property></Property>
      <Property name="label">扦样方式</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;inoutDataPR#triggerSampleType&quot;).getResult()}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="deCheck">
      <Property name="dataType">double</Property>
      <Property name="label">质检扣重</Property>
      <Property name="displayFormat">0.0 KG</Property>
    </PropertyDef>
    <PropertyDef name="addCheck">
      <Property name="dataType">double</Property>
      <Property name="label">质检增重</Property>
      <Property name="displayFormat">0.0 KG</Property>
    </PropertyDef>
    <PropertyDef name="jjlx">
      <Property></Property>
      <Property name="label">检斤类型</Property>
    </PropertyDef>
    <PropertyDef name="dePackage">
      <Property name="dataType">double</Property>
      <Property name="label">包装扣重</Property>
      <Property name="displayFormat">0.0 KG</Property>
    </PropertyDef>
    <PropertyDef name="deOtherInfo">
      <Property></Property>
      <Property name="label">其他扣重原因</Property>
    </PropertyDef>
    <PropertyDef name="settleId">
      <Property></Property>
      <Property name="label">结算单号</Property>
    </PropertyDef>
    <PropertyDef name="bzw">
      <Property></Property>
      <Property name="label">包装物</Property>
    </PropertyDef>
    <PropertyDef name="dbz">
      <Property name="dataType">Double</Property>
      <Property name="label">单包重</Property>
      <Property name="displayFormat">0.0 KG</Property>
    </PropertyDef>
    <PropertyDef name="bzbjs">
      <Property name="dataType">int</Property>
      <Property name="label">包件数</Property>
    </PropertyDef>
    <PropertyDef name="updateTime">
      <Property name="dataType">Date</Property>
      <Property name="label">数据更新时间</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtInoutSettle">
@@ -398,24 +453,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>
@@ -425,60 +526,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">
@@ -499,6 +569,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>
@@ -509,12 +585,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>
@@ -525,5 +608,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>