同步调整

YYC

2024-12-05 a63ccbac7d05e8f7592fd2040275770d59f67c5f

同步调整

 src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java

@@ -7,6 +7,7 @@
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
 * 质量管理，2023年5月26日 根据新国粮规优化调整
@@ -22,7 +23,7 @@

    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "主键ID", description = "ZJ+检验类别+年月日时分秒")
    @PropertyDef(label = "主键ID", description = "yyyyMMdd + 4位顺序号")
    private String id;

    @Column(name = "COMPANY_ID_", length = 10)
@@ -57,13 +58,13 @@
    @PropertyDef(label = "检验时间")
    private Date time;

    @Column(name = "USER_", length = 50)
    @PropertyDef(label = "检验人", description = "检验人员姓名，若有多个保管员")
    private String user;

    @Column(name = "UNIT_", length = 50)
    @PropertyDef(label = "检验单位")
    private String unit;

    @Column(name = "USER_", length = 50)
    @PropertyDef(label = "检验人", description = "检验人员姓名，若有多个保管员")
    private String user;

    @Column(name = "STANDARD_", length = 4)
    @PropertyDef(label = "检验依据", description = "1-国标，0-其他")
@@ -77,6 +78,10 @@
    @Column(name = "RESULT_", length = 40)
    @PropertyDef(label = "检验结论", description = "1、质量指标填写/达标/不达标 2、储存品质指标填写“宜存”、轻度不宜存”、“重度不宜存”3、食品安全指标填写“合格”、不合格” 多项指标时以#分隔，例如：达标|综合判定#宜存#合格 ")
    private String result;

    @Column(name = "spaqzbsfhg", length = 40)
    @PropertyDef(label = "食品安全指标是否合格", description = "0-不合格，1-合格")
    private String spaqzbsfhg;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "签发日期")
@@ -140,4 +145,8 @@
    @PropertyDef(label = "数据更新时间")
    private Date updateTime;

    @Column(name = "REPORT_TYPE_", length = 10)
    @PropertyDef(label = "报告类型", description = "1-单位检验，2-整体检验(加权平均)，3-其他")
    private String reportType;

}

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

@@ -88,16 +88,13 @@
                apiData.setYwrq(sysData.getSubmitTime());
                apiData.setSylx(sysData.getType());
                //净重损溢数量，损耗为正，溢出为负
                if (LOSS_OVER_LOSS.equals(sysData.getType()) || "1".equals(sysData.getType()) || "2".equals(sysData.getType())) {
                    apiData.setJzsysl(sysData.getAmount());
                } else {
                    apiData.setJzsysl(0 - sysData.getAmount());
                }
                if (LOSS_OVER_LOSS.equals(sysData.getType())) {
                    sysData.setType("2");
                }
                if (LOSS_OVER_OVER.equals(sysData.getType())) {
                    sysData.setType("3");
                    apiData.setJzsysl(0 - sysData.getAmount());
                }
                apiData.setRkjz(sysData.getRkjz());
                apiData.setCkjz(sysData.getCkjz());

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

@@ -139,21 +139,21 @@
                api1310.setZbjgpd(fz40Quality.getResult());
                api1310.setQfrq(fz40Quality.getTime());
                api1310.setBgcjsj(fz40Quality.getTime());
                api1310.setShrxm(fz40Quality.getCheckUser());
                if (fz40Quality.getUser().isEmpty()){
                    fz40Quality.setUser(fz40Quality.getCheckUser());
                }
                api1310.setShrxm(fz40Quality.getShrxm().contains("、")?fz40Quality.getShrxm().replace('、','|'):fz40Quality.getShrxm());
                if (null == fz40Quality.getCheckTime()) {
                    fz40Quality.setCheckTime(DateUtils.addDays(fz40Quality.getTime(), -1));
                }
                if (!fz40Quality.getCheckTime().before(fz40Quality.getTime())) {
                    fz40Quality.setCheckTime(DateUtils.addDays(fz40Quality.getTime(), -1));
                }
                api1310.setSpaqzbsfhg(fz40Quality.getSpaqzbsfhg());
                api1310.setQysj(fz40Quality.getCheckTime());
                api1310.setQyqy(fz40Quality.getCheckArea());
                api1310.setQyrxm(fz40Quality.getCheckUser());
                api1310.setJdrxm(fz40Quality.getCheckUser());
                if (fz40Quality.getCheckUser().contains("、")) {
                    api1310.setQyrxm(fz40Quality.getCheckUser().replace('、', '|'));
                    api1310.setJdrxm(fz40Quality.getCheckUser().replace('、', '|'));
                }
                api1310.setQyrxm(fz40Quality.getCheckUser().contains("、") ? fz40Quality.getCheckUser().replace('、', '|') : fz40Quality.getCheckUser());
                api1310.setJdrxm(fz40Quality.getCheckUser().contains("、") ? fz40Quality.getCheckUser().replace('、', '|') : fz40Quality.getCheckUser());


                api1310.setYpsl(fz40Quality.getYpsl() == null ? 0.0 : fz40Quality.getYpsl());