根据国家局接口，调整基础表字段

czt

2024-11-01 dbef4eea6194ffba3bd25f978b33e09d65f5a6de

根据国家局接口，调整基础表字段

 src/main/java/com/fzzy/api/Constant.java

@@ -136,9 +136,9 @@
     */
    public static String API_CODE_1212 = "1212";
    /**
     * æŽ¥å£ç¼–码-1214 å‡ºå…¥åº“记录信息数据接口
     * æŽ¥å£ç¼–码-1213 å°ä»“确认单
     */
    public static String API_CODE_1214 = "1214";
    public static String API_CODE_1213 = "1213";

    /**
     * æŽ¥å£ç¼–码-1301 å®‰å…¨ç®¡ç†æ•°æ®æŽ¥å£

 src/main/java/com/fzzy/api/entity/Api1101.java

@@ -112,6 +112,10 @@
    @Column(name = "sjdwdm", length = 18)
    private String sjdwdm;

    @PropertyDef(label = "上级单位统一编码")
    @Column(name = "sjdwtybm", length = 20)
    private String sjdwtybm;

    @PropertyDef(label = "库区数")
    @Column(name = "kqs")
    private Integer kqs;

 src/main/java/com/fzzy/api/entity/Api1201.java

@@ -54,7 +54,7 @@
    @Column(name = "ywlx", length = 1)
    private String ywlx;

    @PropertyDef(label = "合同种类")
    @PropertyDef(label = "合同种类" ,description = "1:销售合同,2:采购合同,3：委托收储合同,4：委托收购合同")
    @Column(name = "htzl", length = 1)
    private String htzl;


 src/main/java/com/fzzy/api/entity/Api1202.java

@@ -97,6 +97,26 @@
    @Column(name = "gch", length = 32)
    private String gch;

    @PropertyDef(label = "售粮人")
    @Column(name = "slr", length = 200)
    private String slr;

    @PropertyDef(label = "售粮人联系方式")
    @Column(name = "slrlxfs", length = 32)
    private String slrlxfs;

    @PropertyDef(label = "售粮人身份证号")
    @Column(name = "slrsfzh", length = 32)
    private String slrsfzh;

    @PropertyDef(label = "售粮人账号（银行卡或账户）")
    @Column(name = "slrzh", length = 32)
    private String slrzh;

    @PropertyDef(label = "售粮人地址")
    @Column(name = "slrdz", length = 32)
    private String slrdz;

    @PropertyDef(label = "装粮地点")
    @Column(name = "ldd", length = 256)
    private String ldd;
@@ -269,6 +289,14 @@
    @Column(name = "rkjsdh", length = 33)
    private String rkjsdh;

    @PropertyDef(label = "生成方式")
    @Column(name = "scfs")
    private Integer scfs = 1;

    @PropertyDef(label = "手动补录原因")
    @Column(name = "sdblyy", length = 400)
    private String sdblyy;

    @PropertyDef(label = "备注")
    @Column(name = "bz", length = 400)
    private String bz;

 src/main/java/com/fzzy/api/entity/Api1205.java

@@ -213,7 +213,7 @@

    @PropertyDef(label = "生成方式")
    @Column(name = "scfs", length = 1)
    private String scfs;
    private Integer scfs;

    @PropertyDef(label = "手动补录原因")
    @Column(name = "sdblyy", length = 400)

 src/main/java/com/fzzy/api/entity/Api1207.java

@@ -35,7 +35,7 @@
    @Column(name = "dcdh", length = 33)
    private String dcdh;

    @PropertyDef(label = "倒仓类型" )
    @PropertyDef(label = "倒仓类型",description = "0-倒仓；1-移库；2-临时货位入仓")
    @Column(name = "dclx", length = 1)
    private String dclx;


 src/main/java/com/fzzy/api/entity/Api1209.java

@@ -51,9 +51,21 @@
    @Column(name = "ywrq")
    private Date ywrq;

    @PropertyDef(label = "损溢类型", description = "1:损失，2：损耗，3：溢余，4：其他")
    @Column(name = "sylx", length = 1)
    private String sylx;

    @PropertyDef(label = "损溢环节", description = "1:入库损溢，2：出库损溢，3.其他")
    @Column(name = "syhj", length = 1)
    private String syhj;

    @PropertyDef(label = "入库净重(公斤)")
    @Column(name = "rkjz", precision = 20, scale = 6)
    private double rkjz;

    @PropertyDef(label = "入库数量(公斤)")
    @Column(name = "rksl")
    private double rksl;

    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    @PropertyDef(label = "入库时间")
@@ -85,50 +97,47 @@
    @Column(name = "ckzz", precision = 20, scale = 6)
    private double ckzz;

    @PropertyDef(label = "净重损溢数量(公斤)")
    @PropertyDef(label = "储备时长")
    @Column(name = "ccsc",precision = 3)
    private BigDecimal ccsc;

    @PropertyDef(label = "实际损溢数量(公斤)")
    @Column(name = "jzsysl", precision = 20, scale = 6)
    private double jzsysl;

    @PropertyDef(label = "其中：成货位前损耗(公斤)")
    @Column(name = "qzchwqsh", precision = 20, scale = 6)
    private double qzchwqsh;

    @PropertyDef(label = "其中水杂减量(公斤)")
    @PropertyDef(label = "水杂减量(公斤)")
    @Column(name = "qzszkl", precision = 20, scale = 6)
    private double qzszkl;

    @PropertyDef(label = "其中：自然损耗定额(公斤)")
    @PropertyDef(label = "自然损耗定额(公斤)")
    @Column(name = "qzzrshde", precision = 20, scale = 6)
    private double qzzrshde;

    @PropertyDef(label = "是否超耗", description = "1:是，2：否")
    @Column(name = "sfch")
    private Integer sfch;

    @PropertyDef(label = "超耗数量(公斤)")
    @Column(name = "chsl", precision = 20, scale = 6)
    private double chsl;

    @PropertyDef(label = "损益是否正常")
    @PropertyDef(label = "损益是否正常",description = "0:正常，1：不正常")
    @Column(name = "sysfzc", length = 1)
    private String sysfzc;

    @PropertyDef(label = "损溢类型", description = "1:损耗，2：损失，3.其他")
    @Column(name = "sylx", length = 1)
    private String sylx;

    @PropertyDef(label = "储备时长")
    @Column(name = "ccsc",precision = 3)
    private BigDecimal ccsc;

    @PropertyDef(label = "是否超耗", description = "1:是，2：否")
    @Column(name = "sfch", length = 1)
    private String sfch;

    @PropertyDef(label = "损溢环节", description = "1:入库损溢，2：出库损溢，3.其他")
    @Column(name = "syhj", length = 1)
    private String syhj;

    @PropertyDef(label = "损溢原因")
    @Column(name = "syyy", length = 400)
    private String syyy;

    @PropertyDef(label = "出清确认标识",description = "0：未完成出清确认，1：已完成出清确认")
    @Column(name = "cqqrbs")
    private Integer cqqrbs;

    @PropertyDef(label = "出清确认时间")
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    @Column(name = "cqqrsj")
    private Date cqqrsj;

    @PropertyDef(label = "仓储审核人")
    @Column(name = "ccshr", length = 64)
    private String ccshr;

 src/main/java/com/fzzy/api/entity/Api1212.java

@@ -4,15 +4,10 @@
import com.bstek.dorado.annotation.PropertyDef;

import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;

import java.io.Serializable;
import java.util.Date;

@@ -22,7 +17,6 @@
@Data
@Entity
@Table(name = "API_1212")
@EqualsAndHashCode(callSuper = false)
public class Api1212 implements Serializable {



 src/main/java/com/fzzy/api/entity/Api1213.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,115 @@
package com.fzzy.api.entity;

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;

/**
 * @Description æŽ¥å£è¡¨-封仓确认单
 * @Author CZT
 * @Date 2024/11/1 10:26
 */
@Data
@Entity
@Table(name = "API_1213")
public class Api1213 implements Serializable {

    public static String SORT_PROP = "fcrq";

    @Id
    @PropertyDef(label = "封仓确认单号", description = "2位业务编码(21代表封仓)+yyMMdd+4位顺序码，212405040001")
    @Column(name = "fcqrdh", length = 14)
    private String fcqrdh;

    @PropertyDef(label = "货位代码" )
    @Column(name = "hwdm", length = 30)
    private String hwdm;

    @PropertyDef(label = "统一货位编码")
    @Column(name = "tyhwbm", length = 28)
    private String tyhwbm;

    @PropertyDef(label = "封仓日期")
    @JSONField(format = "yyyy-MM-dd")
    @Column(name = "fcrq")
    private Date fcrq;

    @PropertyDef(label = "粮食品种代码")
    @Column(name = "lspzdm", length = 7)
    private String lspzdm;

    @PropertyDef(label = "粮食性质代码")
    @Column(name = "lsxzdm", length = 3)
    private String lsxzdm;

    @PropertyDef(label = "粮食等级代码")
    @Column(name = "lsdjdm", length = 2)
    private String lsdjdm;

    @PropertyDef(label = "收获年度")
    @Column(name = "shnd", length = 4)
    private String shnd;

    @PropertyDef(label = "国别")
    @Column(name = "gb", length = 10)
    private String gb;

    @PropertyDef(label = "产地")
    @Column(name = "cd", length = 6)
    private String cd;

    @PropertyDef(label = "保管员")
    @Column(name = "bgy", length = 20)
    private String bgy;

    @PropertyDef(label = "封仓数量")
    @Column(name = "fcsl")
    private Double fcsl;

    @PropertyDef(label = "封仓申请人")
    @Column(name = "fcsrq", length = 40)
    private String fcsrq;

    @PropertyDef(label = "部门审核人")
    @Column(name = "bmshr", length = 40)
    private String bmshr;

    @PropertyDef(label = "领导审核人")
    @Column(name = "ldshr", length = 40)
    private String ldshr;

    @PropertyDef(label = "备注")
    @Column(name = "bz", length = 200)
    private String bz;

    @PropertyDef(label = "操作标志")
    @Column(name = "czbz", length = 1)
    private String czbz;

    @PropertyDef(label = "最后更新时间")
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    @Column(name = "zhgxsj")
    private Date zhgxsj;

    @JSONField(serialize = false)
    @PropertyDef(label = "业务id")
    @Column(name = "bizId", length = 40)
    private String bizId;

    @JSONField(serialize = false)
    @PropertyDef(label = "库区代码")
    @Column(name = "kqdm", length = 21)
    private String kqdm;

    @JSONField(serialize = false)
    @PropertyDef(label = "同步时间", description = "从粮库系统同步到接口管理中心的时间")
    @Column(name = "syncTime")
    private Date syncTime;

}

 src/main/java/com/fzzy/api/view/Api1101.view.xml

@@ -103,6 +103,10 @@
        <Property></Property>
        <Property name="label">上级单位代码</Property>
      </PropertyDef>
      <PropertyDef name="sjdwtybm">
        <Property></Property>
        <Property name="label">上级单位统一编码</Property>
      </PropertyDef>
      <PropertyDef name="kqs">
        <Property name="dataType">Integer</Property>
        <Property name="label">库区数</Property>
@@ -630,6 +634,11 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">sjdwtybm</Property>
                <Property name="property">sjdwtybm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">kqs</Property>
                <Property name="property">kqs</Property>
                <Editor/>

 src/main/java/com/fzzy/api/view/Api1201.view.xml

@@ -42,6 +42,34 @@
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="htzl">
        <Property></Property>
        <Property name="label">合同种类</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1:销售合同</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">2:采购合同</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">3：委托收储合同</Property>
              </Entity>
              <Entity>
                <Property name="key">4</Property>
                <Property name="value">4：委托收购合同</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="khlx">
        <Property></Property>
        <Property name="label">客户类型</Property>
@@ -211,6 +239,38 @@
      <PropertyDef name="wcrq">
        <Property name="dataType">Date</Property>
        <Property name="label">完成日期</Property>
      </PropertyDef>
      <PropertyDef name="ysfs">
        <Property></Property>
        <Property name="label">验收方式</Property>
      </PropertyDef>
      <PropertyDef name="fkfs">
        <Property></Property>
        <Property name="label">付款方式</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1：全额先款后货</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">2：按到款进度逐批发货</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">3：货到并确认后一次性付款</Property>
              </Entity>
              <Entity>
                <Property name="key">4</Property>
                <Property name="value">4：按到货批次逐批确认、逐批付款</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="zhgxsj">
        <Property></Property>
@@ -503,6 +563,11 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">htzl</Property>
            <Property name="property">htzl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">khlx</Property>
            <Property name="property">khlx</Property>
            <Editor/>
@@ -678,6 +743,16 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ysfs</Property>
            <Property name="property">ysfs</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">fkfs</Property>
            <Property name="property">fkfs</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zhgxsj</Property>
            <Property name="property">zhgxsj</Property>
            <Editor/>

 src/main/java/com/fzzy/api/view/Api1202.view.xml

@@ -84,6 +84,26 @@
        <Property></Property>
        <Property name="label">挂车号</Property>
      </PropertyDef>
      <PropertyDef name="slr">
        <Property></Property>
        <Property name="label">售粮人</Property>
      </PropertyDef>
      <PropertyDef name="slrlxfs">
        <Property></Property>
        <Property name="label">售粮人联系方式</Property>
      </PropertyDef>
      <PropertyDef name="slrsfzh">
        <Property></Property>
        <Property name="label">售粮人身份证号</Property>
      </PropertyDef>
      <PropertyDef name="slrzh">
        <Property></Property>
        <Property name="label">售粮人账号</Property>
      </PropertyDef>
      <PropertyDef name="slrdz">
        <Property></Property>
        <Property name="label">售粮人地址</Property>
      </PropertyDef>
      <PropertyDef name="ldd">
        <Property></Property>
        <Property name="label">装粮地点</Property>
@@ -267,6 +287,30 @@
      <PropertyDef name="rkjsdh">
        <Property></Property>
        <Property name="label">入库结算单号</Property>
      </PropertyDef>
      <PropertyDef name="scfs">
        <Property name="dataType">Integer</Property>
        <Property name="label">生成方式</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1：流程生成</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">2：手动补录</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="sdblyy">
        <Property></Property>
        <Property name="label">手动补录原因</Property>
      </PropertyDef>
      <PropertyDef name="bz">
        <Property></Property>
@@ -642,6 +686,31 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">slr</Property>
            <Property name="property">slr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">slrlxfs</Property>
            <Property name="property">slrlxfs</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">slrsfzh</Property>
            <Property name="property">slrsfzh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">slrzh</Property>
            <Property name="property">slrzh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">slrdz</Property>
            <Property name="property">slrdz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ldd</Property>
            <Property name="property">ldd</Property>
            <Editor/>
@@ -853,6 +922,16 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">scfs</Property>
            <Property name="property">scfs</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sdblyy</Property>
            <Property name="property">sdblyy</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bz</Property>
            <Property name="property">bz</Property>
            <Editor/>

 src/main/java/com/fzzy/api/view/Api1205.view.xml

@@ -202,6 +202,34 @@
        <Property></Property>
        <Property name="label">出库结算单号</Property>
      </PropertyDef>
      <PropertyDef name="zjbgdh">
        <Property></Property>
        <Property name="label">质检报告单号</Property>
      </PropertyDef>
      <PropertyDef name="scfs">
        <Property name="dataType">Integer</Property>
        <Property name="label">生成方式</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1：流程生成</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">2：手动补录</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="sdblyy">
        <Property></Property>
        <Property name="label">手动补录原因</Property>
      </PropertyDef>
      <PropertyDef name="bz">
        <Property></Property>
        <Property name="label">备注</Property>
@@ -676,6 +704,21 @@
            <Property name="property">ckjsdh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zjbgdh</Property>
            <Property name="property">zjbgdh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">scfs</Property>
            <Property name="property">scfs</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement layoutConstraint="colSpan:3">
            <Property name="name">sdblyy</Property>
            <Property name="property">sdblyy</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement layoutConstraint="colSpan:3">
            <Property name="name">bz</Property>
            <Property name="property">bz</Property>

 src/main/java/com/fzzy/api/view/Api1209.view.xml

@@ -46,6 +46,10 @@
        <Property name="dataType">double</Property>
        <Property name="label">入库净重(公斤)</Property>
      </PropertyDef>
      <PropertyDef name="rksl">
        <Property name="dataType">double</Property>
        <Property name="label">入库数量(公斤)</Property>
      </PropertyDef>
      <PropertyDef name="rksj">
        <Property></Property>
        <Property name="label">入库时间</Property>
@@ -78,19 +82,15 @@
      </PropertyDef>
      <PropertyDef name="jzsysl">
        <Property name="dataType">double</Property>
        <Property name="label">净重损溢数量(公斤)</Property>
      </PropertyDef>
      <PropertyDef name="qzchwqsh">
        <Property name="dataType">double</Property>
        <Property name="label">其中：成货位前损耗(公斤)</Property>
        <Property name="label">实际损溢数量(公斤)</Property>
      </PropertyDef>
      <PropertyDef name="qzszkl">
        <Property name="dataType">double</Property>
        <Property name="label">其中水杂减量(公斤)</Property>
        <Property name="label">水杂减量(公斤)</Property>
      </PropertyDef>
      <PropertyDef name="qzzrshde">
        <Property name="dataType">double</Property>
        <Property name="label">其中：自然损耗定额(公斤)</Property>
        <Property name="label">自然损耗定额(公斤)</Property>
      </PropertyDef>
      <PropertyDef name="chsl">
        <Property name="dataType">double</Property>
@@ -143,15 +143,19 @@
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1:损耗</Property>
                <Property name="value">1:损失</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">2:损失</Property>
                <Property name="value">2:损耗</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">3:溢余</Property>
              </Entity>
              <Entity>
                <Property name="key">4</Property>
                <Property name="value">4:其他</Property>
              </Entity>
            </Collection>
          </Property>
@@ -190,8 +194,48 @@
        <Property name="label">储备时长</Property>
      </PropertyDef>
      <PropertyDef name="sfch">
        <Property/>
        <Property name="dataType">Integer</Property>
        <Property name="label">是否超耗</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1:是</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">2:否</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="cqqrbs">
        <Property name="dataType">Integer</Property>
        <Property name="label">出清确认标识</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">0</Property>
                <Property name="value">0:未完成出清确认</Property>
              </Entity>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1:已完成出清确认</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="cqqrsj">
        <Property name="dataType">DateTime</Property>
        <Property name="label">出清确认时间</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
@@ -473,6 +517,11 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">rksl</Property>
                <Property name="property">rksl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">rksj</Property>
                <Property name="property">rksj</Property>
                <Editor/>
@@ -513,11 +562,6 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">qzchwqsh</Property>
                <Property name="property">qzchwqsh</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">qzszkl</Property>
                <Property name="property">qzszkl</Property>
                <Editor/>
@@ -525,6 +569,11 @@
              <AutoFormElement>
                <Property name="name">qzzrshde</Property>
                <Property name="property">qzzrshde</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">sfch</Property>
                <Property name="property">sfch</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -598,8 +647,13 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">sfch</Property>
                <Property name="property">sfch</Property>
                <Property name="name">cqqrbs</Property>
                <Property name="property">cqqrbs</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">cqqrsj</Property>
                <Property name="property">cqqrsj</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>

 src/main/java/com/fzzy/api/view/Api1213.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/otherview/gd2022/GdApi2001.view.xml ÐÞ¸Ä
@@ -4,26 +4,18 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.push.gd2022.dto.Gd2022Api2001</Property>
      <Property name="creationType">com.fzzy.api.entity.Api1213</Property>
      <PropertyDef name="fcqrdh">
        <Property></Property>
        <Property name="label">封仓确认单号</Property>
      </PropertyDef>
      <PropertyDef name="cfdm">
      <PropertyDef name="hwdm">
        <Property></Property>
        <Property name="label">仓房代码</Property>
        <Property name="label">货位代码</Property>
      </PropertyDef>
      <PropertyDef name="tycfbm">
      <PropertyDef name="tyhwbm">
        <Property></Property>
        <Property name="label">统一仓房编码</Property>
      </PropertyDef>
      <PropertyDef name="ajdm">
        <Property></Property>
        <Property name="label">廒间代码</Property>
      </PropertyDef>
      <PropertyDef name="tyajbm">
        <Property></Property>
        <Property name="label">统一廒间编码</Property>
        <Property name="label">统一货位编码</Property>
      </PropertyDef>
      <PropertyDef name="fcrq">
        <Property name="dataType">Date</Property>
@@ -109,6 +101,14 @@
        <Property name="dataType">DateTime</Property>
        <Property name="label">最后更新时间</Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="bizId">
        <Property></Property>
        <Property name="label">业务id</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
      <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
@@ -139,7 +139,7 @@
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataType">[dtMain]</Property>
      <Property name="dataProvider">gDApi2001PR#listData</Property>
      <Property name="dataProvider">api1213PR#pageList</Property>
      <Property name="pageSize">15</Property>
    </DataSet>
    <DataSet id="dsQuery">
@@ -278,13 +278,18 @@
        <Property name="width">180</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="cfdm">
        <Property name="property">cfdm</Property>
      <DataColumn name="kqdm">
        <Property name="property">kqdm</Property>
        <Property name="width">210</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="ajdm">
        <Property name="property">ajdm</Property>
      <DataColumn name="hwdm">
        <Property name="property">hwdm</Property>
        <Property name="width">210</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="tyhwbm">
        <Property name="property">tyhwbm</Property>
        <Property name="width">230</Property>
        <Property name="align">center</Property>
      </DataColumn>
@@ -369,23 +374,13 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">cfdm</Property>
                <Property name="property">cfdm</Property>
                <Property name="name">hwdm</Property>
                <Property name="property">hwdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">tycfbm</Property>
                <Property name="property">tycfbm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">ajdm</Property>
                <Property name="property">ajdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">tyajbm</Property>
                <Property name="property">tyajbm</Property>
                <Property name="name">tyhwbm</Property>
                <Property name="property">tyhwbm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -463,6 +458,16 @@
                <Property name="property">zhgxsj</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">kqdm</Property>
                <Property name="property">kqdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bizId</Property>
                <Property name="property">bizId</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
@@ -470,22 +475,22 @@
      <Tools/>
    </Dialog>
    <UpdateAction id="updateSave">
      <Property name="dataResolver">gDApi2001PR#saveData</Property>
      <Property name="dataResolver">api1213PR#updateSave</Property>
      <UpdateItem>
        <Property name="dataPath">[#current]</Property>
        <Property name="dataSet">dsMain</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxPush">
      <Property name="service">gDApi2001PR#pushData</Property>
      <Property name="service">api1213PR#pushData</Property>
      <Property name="confirmMessage">确定要上报么？</Property>
    </AjaxAction>
    <AjaxAction id="ajaxDel">
      <Property name="service">gDApi2001PR#delData</Property>
      <Property name="service">api1213PR#delData</Property>
      <Property name="confirmMessage">当前数据删除后无法恢复，请确认要删除么？</Property>
    </AjaxAction>
    <AjaxAction id="ajaxDelUpdate">
      <Property name="service">gDApi2001PR#delUpdate</Property>
      <Property name="service">api1213PR#delUpdate</Property>
      <Property name="confirmMessage">确定要将数据标记为删除么？</Property>
    </AjaxAction>
  </View>

 src/main/java/com/fzzy/api/view/pr/Api1213PR.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,236 @@
package com.fzzy.api.view.pr;

import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.Api1213;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1213Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;

import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.List;

/**
 * @Description å°ä»“确认单
 * @Author CZT
 * @Date 2024/11/1 10:40
 */
@Slf4j
@Component
public class Api1213PR {

    @Autowired
    private Api1213Rep apiRepository;
    @Autowired
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;

    /**
     * api1213PR#pageList
     *
     * @return
     */
    @DataProvider
    public void pageList(Page<Api1213> page, ApiParam param) {

        //多参数分页查询
        Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, Api1213.SORT_PROP);

        if (null == param) {
            org.springframework.data.domain.Page<Api1213> japPage = apiRepository.findAll(pageable);
            page.setEntityCount((int) japPage.getTotalElements());
            page.setEntities(japPage.getContent());

            return;
        }

        Specification<Api1213> specification = new Specification<Api1213>() {
            private static final long serialVersionUID = 1L;

            public Predicate toPredicate(Root<Api1213> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
                List<Predicate> predicates = new ArrayList<>(); //所有的断言

                if (StringUtils.isNotBlank(param.getKqdm())) {
                    Predicate predicate1 = cb.equal(root.get("kqdm"), param.getKqdm());
                    predicates.add(predicate1);
                }

                if (StringUtils.isNotBlank(param.getCzbz())) {
                    Predicate predicate2 = cb.equal(root.get("czbz"), param.getCzbz());
                    predicates.add(predicate2);
                }
                if (null != param.getStart()) {
                    Predicate predicate3 = cb.greaterThan(root.get("zhgxsj"), ContextUtil.getCurZero(param.getStart()));
                    predicates.add(predicate3);
                }

                if (null != param.getEnd()) {
                    Predicate predicate4 = cb.lessThan(root.get("zhgxsj"), ContextUtil.getNextZero(param.getEnd()));
                    predicates.add(predicate4);
                }
                return cb.and(predicates.toArray(new Predicate[0]));
            }
        };

        log.debug("---------分页参数查询----------{}", param.toString());
        org.springframework.data.domain.Page<Api1213> japPage = apiRepository.findAll(specification, pageable);
        page.setEntityCount((int) japPage.getTotalElements());
        page.setEntities(japPage.getContent());
    }


    /**
     * Api1213PR#updateSave
     *
     * @param entity
     */
    @DataResolver
    public void updateSave(Api1213 entity) {

        if (StringUtils.isEmpty(entity.getCzbz())) {
            entity.setCzbz(Constant.CZBZ_I);
        }

        //手动将doradoEntity对象转换为标准Bean对象
        Api1213 data = new Api1213();
        BeanUtils.copyProperties(entity, data);

        if(StringUtils.isEmpty(data.getFcqrdh())){
            data.setFcqrdh(ContextUtil.getUUID());
        }
        apiRepository.save(data);
    }


    /**
     * Api1213PR#delData
     *
     * @param data
     */
    @Expose
    public String delData(Api1213 data) {
        if(null == data) return "无数据执行";
        apiRepository.deleteById(data.getFcqrdh());

        return null;
    }

    /**
     * æ›´æ–°åˆ é™¤æ ‡è®° Api1213PR#delUpdate
     *
     * @param entity
     */
    @Expose
    public String delUpdate(Api1213 entity) {
        if(null == entity) return "无数据执行";
    	
        entity.setCzbz(Constant.CZBZ_D);

        Api1213 data = new Api1213();
        BeanUtils.copyProperties(entity, data);

        apiRepository.save(data);

        return null;
    }

    /**
     * Api1213PR#pushData
     *
     * @param items
     */
    @Expose
    public String pushData(List<Api1213> items) {

        String kqdm = items.get(0).getKqdm();
        ApiConfs apiConf = apiCommonService.getConf(kqdm);

        if (null == apiConf) return "系统没有获取到当前库区配置信息，执行失败";

        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
        if (null == apiService) return "系统没有当前推送协议配置，执行失败";

        return pushDataSingle(items, apiService, apiConf);
    }

    /**
     * å•æ¡æ•°æ®json推送
     *
     * @param items
     * @param apiService
     * @param apiConf
     * @return
     */
    private String pushDataSingle(List<Api1213> items, ApiRemoteService apiService, ApiConfs apiConf) {
        ResponseDto responseDto;
        String result = "";

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1212);
        Api1213 d;
        for (Api1213 data : items) {
            d = new Api1213();
            BeanUtils.copyProperties(data, d);
            responseDto = apiService.pushData(param, apiConf, d);
            result += responseDto.toString();
            if (responseDto.getSuccess() == 0) {
                //todo ä»£è¡¨ä¸Šä¼ æˆåŠŸ ,后期需要保存日志
                if ("i".equals(d.getCzbz())) {
                    apiRepository.updateStatus(d.getFcqrdh(), Constant.CZBZ_U);
                }
            }
        }
        return result;
    }

    /**
     * å¤šæ¡æ•°æ®json推送
     *
     * @param items
     * @param apiRemoteService
     * @param apiConf
     * @return
     */
    private String pushDataList(List<Api1213> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1212);

        //推送，数据为集合形式
        ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            for (Api1213 data : items) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    //更新状态
                    apiRepository.updateStatus(data.getFcqrdh(), Constant.CZBZ_U);
                }
            }
        }
        return responseDto.toString();
    }

}

 src/main/java/com/fzzy/api/view/repository/Api1213Rep.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.fzzy.api.view.repository;

import com.fzzy.api.entity.Api1213;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
import java.util.List;


/**
 * @Description å°ä»“确认单
 * @Author CZT
 * @Date 2024/11/1 10:42
 */
public interface Api1213Rep extends JpaRepository<Api1213, String>, JpaSpecificationExecutor<Api1213> {

    @Transactional
    @Modifying
    @Query("update Api1213 set czbz =:czbz where fcqrdh=:fcqrdh")
    void updateStatus(@Param("fcqrdh") String fcqrdh, @Param("czbz") String czbz);

    @Query("from Api1213 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
    List<Api1213> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);

    @Query("from Api1213 where fcqrdh=:fcqrdh ")
    List<Api1213> getDataById(@Param("fcqrdh") String fcqrdh);
}

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java

@@ -160,6 +160,13 @@

                apiData.setDjsj(sysData.getRegisterTime());

                //生成方式
                apiData.setScfs(1);
                if(StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")){
                    apiData.setScfs(2);
                    apiData.setSdblyy("库区停电导致无法按流程进行出库");
                }

                //粮食品种
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                apiData.setLspzdm(mappingCode);

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java

@@ -164,11 +164,11 @@
                apiData.setZjbgdh(dataByHwdm.get(0).getZjbgdh());

                //生成方式
                apiData.setScfs(sysData.getRecordStatus().equals("ADD") ? "2" : "1");

                //手动补录原因
                apiData.setSdblyy("库区停电，无法上传");

                apiData.setScfs(1);
                if(StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")){
                    apiData.setScfs(2);
                    apiData.setSdblyy("库区停电导致无法按流程进行出库");
                }

                //粮食性质
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java

@@ -110,12 +110,14 @@
                apiData.setRkzz(sysData.getRkzz());
                apiData.setCksf(sysData.getCksf());
                apiData.setCkzz(sysData.getCkzz());
                apiData.setQzchwqsh(0);
                apiData.setQzszkl(0);
                apiData.setQzzrshde(0);
                apiData.setChsl(0);
                apiData.setQzszkl(sysData.getQzszkl());
                apiData.setQzzrshde(sysData.getQzzrshde());
                apiData.setChsl(sysData.getChsl());
                apiData.setSysfzc(StringUtils.isEmpty(sysData.getSysfzc()) ? "0" : sysData.getSysfzc());
                apiData.setSfch("0".equals(apiData.getSysfzc()) ? "2" : "1");
                apiData.setSfch(2);
                if(apiData.getJzsysl() > apiData.getQzszkl()){
                    apiData.setSfch(1);
                }
                apiData.setSyyy(sysData.getSyyy());
                apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "审核人" : sysData.getCcshr());
                apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "审核人" : sysData.getZjshr());

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java

@@ -50,7 +50,7 @@
        apiLog.setType(ApiLog.TYPE_SYNC);
        apiLog.setKqdm(deptId);
        apiLog.setUploadTime(new Date());
        apiLog.setInteId(Constant.API_CODE_1214);
        apiLog.setInteId("1214");
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        try {

 src/main/java/com/fzzy/otherview/gd2022/GdApi2002.view.xml

ÎļþÒÑɾ³ý

 src/main/java/com/fzzy/otherview/gd2022/pr/GDApi2001PR.java

ÎļþÒÑɾ³ý

 src/main/java/com/fzzy/otherview/gd2022/pr/GDApi2002PR.java

ÎļþÒÑɾ³ý

 src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java

@@ -119,6 +119,7 @@
        if (apiInfoList.size() != 0) {
            infoData = apiInfoList.get(0);
            infoData.setData(JSON.toJSONString(data));
            infoData.setCzbz(data.getCzbz());
        } else {
            infoData = new ApiInfoData();
            infoData.setId(ContextUtil.getUUID());

 src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java

@@ -85,7 +85,7 @@
    private Double qzzrshde;

    @PropertyDef(label = "是否超耗" )
    private String sfch;
    private Integer sfch;

    @PropertyDef(label = "超耗数量(公斤)" )
    private Double chsl;
@@ -97,10 +97,11 @@
    private String syyy;

    @PropertyDef(label = "出清确认标识" )
    private String cqqrbs;
    private Integer cqqrbs;

    @PropertyDef(label = "出清确认时间" )
    private String cqqrsj;
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private Date cqqrsj;

    @PropertyDef(label = "仓储审核人" )
    private String ccshr;

 src/main/java/com/fzzy/push/impl/ComPushService12.java

@@ -46,7 +46,8 @@
    private Api1211Rep api1211Rep;
    @Autowired
    private Api1212Rep api1212Rep;

    @Autowired
    private Api1213Rep api1213Rep;
    /**
     * 1109 æ–‡ä»¶ä¿¡æ¯åŒæ­¥
     */
@@ -427,4 +428,32 @@
            }
        }
    }

    /**
     * 1213 å°ä»“确认单
     */
    public void pushData1213(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取客户信息
        List<Api1213> list = api1213Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----未获取到客户信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_12);
        param.setInteId(Constant.API_CODE_1213);

        ResponseDto responseDto;
        for (Api1213 data : list) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    data.setCzbz(Constant.CZBZ_U);
                    //更新状态
                    api1213Rep.save(data);
                }
            }
        }
    }
}

 src/main/resources/application.yml

@@ -1,7 +1,7 @@
##########################  Server   ##########################
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: igds-api
  main:

 src/main/resources/templates/home/home.html

@@ -211,6 +211,9 @@
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1212.d">客户信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1213.d">封仓确认单</a>
                            </dd>
                        </dl>
                    </li>