武汉军粮-出入库信息同步

ws

2024-07-25 c98f22a26ee5d931faa840f547cf9b2c684afc4e

武汉军粮-出入库信息同步

 src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java

@@ -6,6 +6,7 @@
import com.fzzy.api.service.SyncService12;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1204;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1207;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1212;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1214;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,8 @@
    private Fz40ToWhjlSync1207 fz40ToWhjlSync1207;
    @Autowired
    private Fz40ToWhjlSync1214 fz40ToWhjlSync1214;
    @Autowired
    private Fz40ToWhjlSync1212 fz40ToWhjlSync1212;


    @Override
@@ -43,18 +46,19 @@
        Date start = param.getStart();
        Date end = param.getEnd();

        // åŒæ­¥å®¢æˆ·ä¿¡æ¯
        fz40ToWhjlSync1204.syncData(kqdm, deptId, start, end);
        // åŒæ­¥åˆåŒä¿¡æ¯
        fz40ToWhjlSync1207.syncData(kqdm, deptId, start, end);
//        // åŒæ­¥å®¢æˆ·ä¿¡æ¯
//        fz40ToWhjlSync1204.syncData(kqdm, deptId, start, end);
//        // åŒæ­¥åˆåŒä¿¡æ¯
//        fz40ToWhjlSync1207.syncData(kqdm, deptId, start, end);
        //TODO åŒæ­¥åº“存台账信息

        //TODO åŒæ­¥åº“存台账产品批次信息

        //TODO åŒæ­¥åº“存台账出入信息

        // åŒæ­¥å‡ºå…¥åº“记录
        fz40ToWhjlSync1214.syncData(kqdm, deptId, start, end);
        fz40ToWhjlSync1212.syncData(kqdm, deptId, start, end);

//        // åŒæ­¥å‡ºå…¥åº“记录
//        fz40ToWhjlSync1214.syncData(kqdm, deptId, start, end);
    }

}

 src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlInoutRecord.java

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

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;

/**
 * å‡ºå…¥åº“管理
 *
 * @Author:YAN
 */
@Data
@Entity
@Table(name = "D_INOUT_RECORD")
public class Fz40WhjlInoutRecord implements Serializable {

    private static final long serialVersionUID = 1L;
    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "流水号", description = "根据一定的规则生成")
    private String id;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;

    @Column(name = "DEPT_ID_", length = 50)
    @PropertyDef(label = "库区编码")
    private String deptId;

    @Column(name = "NOTICE_ID_", length = 40)
    @PropertyDef(label = "通知单编码")
    private String noticeId;

    @Column(name = "DEPOT_ID_", length = 50)
    @PropertyDef(label = "装卸仓库")
    private String depotId;

    @Column(name = "TYPE_", length = 10)
    @PropertyDef(label = "出入库类型", description = "IN=入库，OUT=出库")
    private String type;

    @Column(name = "PROGRESS_", length = 20)
    @PropertyDef(label = "流程进度")
    private String progress;

    @Column(name = "RECORD_STATUS_", length = 10)
    @PropertyDef(label = "数据状态", description = "数据状态，正常，异常（2小时内重复出入库等），补录")
    private String recordStatus;

    @Column(name = "CUSTOMER_NAME_", length = 50)
    @PropertyDef(label = "往来单位", description = "关联通知单获取")
    private String customerName;

    @Column(name = "INTEL_CARD_", length = 20)
    @PropertyDef(label = "智慧卡号")
    private String intelCard;

    /*** ------------------------登记-------------------------------------**/
    @Column(name = "REGISTER_TIME_")
    @PropertyDef(label = "登记时间")
    private Date registerTime;

    @Column(name = "REGISTER_USER_", length = 50)
    @PropertyDef(label = "登记人")
    private String registerUser;

    @Column(name = "USER_NAME_", length = 40)
    @PropertyDef(label = "承运人")
    private String userName;

    @Column(name = "USER_CONTACT_", length = 20)
    @PropertyDef(label = "联系方式")
    private String userContact;

    @Column(name = "USER_ID_", length = 20)
    @PropertyDef(label = "身份证号")
    private String userId;

    @Column(name = "USER_ADDRESS_", length = 100)
    @PropertyDef(label = "承运人地址")
    private String userAddress;

    @Column(name = "USER_BIRTHDAY_")
    @PropertyDef(label = "出生日期")
    private Date userBirthday;

    @Column(name = "USER_SEX_", length = 10)
    @PropertyDef(label = "性别")
    private String userSex;

    @Column(name = "USER_NATION_", length = 10)
    @PropertyDef(label = "民族")
    private String userNation;

    @Column(name = "PLATE_NUM_", length = 20)
    @PropertyDef(label = "车船号", description = "车牌号+标识符")
    private String plateNum;

    @Column(name = "TRANS_TYPE_", length = 6)
    @PropertyDef(label = "运输工具")
    private String transType;


    /*** ------------------------粮食基础信息-------------------------------------**/
    @Column(name = "FOOD_VARIETY_", length = 20)
    @PropertyDef(label = "粮食品种")
    private String foodVariety;

    @Column(name = "FOOD_TYPE_", length = 20)
    @PropertyDef(label = "粮食性质")
    private String foodType;

    @Column(name = "FOOD_LOCATION_ID_", length = 20)
    @PropertyDef(label = "产地名称代码")
    private String foodLocationId;

    @Column(name = "FOOD_LOCATION_", length = 40)
    @PropertyDef(label = "产地名称")
    private String foodLocation;

    @Column(name = "FOOD_YEAR_", length = 10)
    @PropertyDef(label = "收货年度")
    private String foodYear;

    /*** ------------------------扦样质检信息-------------------------------------**/
    @Column(name = "FOOD_LEVEL_", length = 20)
    @PropertyDef(label = "粮食定等")
    private String foodLevel;

    @Column(name = "CHECK_STATUS_", length = 10)
    @PropertyDef(label = "质检结果")
    private String checkStatus;

    @Column(name = "CHECK_USER_", length = 50)
    @PropertyDef(label = "质检人")
    private String checkUser;

    @Column(name = "CHECK_TIME_")
    @PropertyDef(label = "质检时间")
    private Date checkTime;

    @Column(name = "SAMPLE_USER_", length = 50)
    @PropertyDef(label = "扦样人")
    private String sampleUser;

    @Column(name = "SAMPLE_TIME_")
    @PropertyDef(label = "扦样时间")
    private Date sampleTime;

    @Column(name = "SAMPLE_TYPE_", length = 1)
    @PropertyDef(label = "扦样方式", description = "0-人工，1=自动，2=智能随机")
    private String sampleType;

    @Column(name = "CHECK_ID_", length = 12)
    @PropertyDef(label = "质检单号")
    private String checkId;

    @Column(name = "DE_CHECK_")
    @PropertyDef(label = "质检扣重", description = "单位KG")
    private double deCheck = 0.0;

    @Column(name = "ADD_CHECK_")
    @PropertyDef(label = "质检增重", description = "单位KG")
    private double addCheck = 0.0;

    /*** ------------------------称重环节-------------------------------------**/

    @Column(name = "jjlx", length = 2)
    @PropertyDef(label = "检斤类型", description = "0：称重入库 1：标准包入库 é»˜è®¤ä¸ºç§°é‡å…¥åº“，标准包入库相关字段可为空")
    private String jjlx = "1";

    @Column(name = "FULL_WEIGHT_")
    @PropertyDef(label = "满车称重", description = "入库时候表示第一次称重，出库时候表示第二次称重，单位KG")
    private Double fullWeight = 0.0;

    @Column(name = "FULL_WEIGHT_TIME_")
    @PropertyDef(label = "满车称重时间")
    private Date fullWeightTime;

    @Column(name = "FULL_WEIGHT_USER_", length = 40)
    @PropertyDef(label = "满车称重人")
    private String fullWeightUser;

    @Column(name = "EMPTY_WEIGHT_")
    @PropertyDef(label = "空车称重", description = "入库时表示第二次称重，出库时候表示第一次称重，单位KG")
    private Double emptyWeight = 0.0;

    @Column(name = "EMPTY_WEIGHT_TIME_")
    @PropertyDef(label = "空车称重时间")
    private Date emptyWeightTime;

    @Column(name = "EMPTY_WEIGHT_USER_", length = 50)
    @PropertyDef(label = "空车称重人")
    private String emptyWeightUser;

    @Column(name = "NET_WEIGHT_")
    @PropertyDef(label = "净毛重", description = "单位KG，等于满车 - ç©ºè½¦")
    private double netWeight = 0.0;

    @Column(name = "DE_HANDLE_")
    @PropertyDef(label = "现场扣重", description = "单位KG")
    private double deHandle = 0.0;

    @Column(name = "DE_PACKAGE_")
    @PropertyDef(label = "包装扣重", description = "单位KG")
    private double dePackage = 0.0;

    @Column(name = "DE_OTHER_")
    @PropertyDef(label = "其他扣重", description = "单位KG")
    private double deOther = 0.0;

    @Column(name = "DE_OTHER_INTO_", length = 200)
    @PropertyDef(label = "其他扣重原因")
    private String deOtherInfo;

    @Column(name = "SETTLE_WEIGHT_")
    @PropertyDef(label = "结算重量", description = "扣重后净重，结算净重，单位KG")
    private Double settleWeight = 0.0;

    @Column(name = "RECORD_WEIGHT_")
    @PropertyDef(label = "入库重量", description = "扣重后净重，结算净重，补包括增重，单位KG")
    private Double recordWeight = 0.0;


    /**
     * -----------结算信息-----------------------
     **/
    @Column(name = "PRICE_")
    @PropertyDef(label = "单价", description = "单位：元/公斤，实际结算价格以结算单中单价为准")
    private Double price = 0.0;

    @Column(name = "SETTLE_MONEY_")
    @PropertyDef(label = "结算金额", description = "单位：元，实际结算以计算单为准")
    private Double settleMoney = 0.00;

    @Column(name = "SETTLE_ID_", length = 50)
    @PropertyDef(label = "结算单号", description = "如果是单车结算必填")
    private String settleId;

    /**
     * ----------- å€¼ä»“信息-----------------------
     **/
    @Column(name = "HANDLE_USER_", length = 40)
    @PropertyDef(label = "值仓操作人")
    private String handleUser;

    // å‡ºåº“
    @Column(name = "COMPLETE_TIME_")
    @PropertyDef(label = "完成时间")
    private Date completeTime;

    @Column(name = "COMPLETE_USER_", length = 40)
    @PropertyDef(label = "完成确认人")
    private String completeUser;

    // å¤‡æ³¨
    @Column(name = "REMARKS_", length = 200)
    @PropertyDef(label = "备注信息")
    private String remarks;


    /**
     * ----------- å…¶ä»–信息，针对检斤类型标准包入库填写-----------------------
     **/
    @Column(name = "bzw", length = 2)
    @PropertyDef(label = "包装物", description = "1：包2：桶3：箱 9：其他")
    private String bzw;

    @Column(name = "dbz")
    @PropertyDef(label = "单包重", description = "单位：公斤")
    private Double dbz;

    @Column(name = "bzbjs")
    @PropertyDef(label = "包件数", description = "单位：件")
    private int bzbjs;

    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "数据更新时间")
    private Date updateTime;


}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,239 @@
package com.fzzy.async.whhpjl.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.Constant;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.entity.ApiTrigger;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.api.view.repository.ApiTriggerRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultContract;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDept;
import com.fzzy.async.whhpjl.entity.Fz40WhjlInoutRecord;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1101Rep;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1212Rep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;


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


/**
 * å‡ºå…¥åº“记录信息
 *
 */
@Slf4j
@Component
public class Fz40ToWhjlSync1212 {

    @Autowired
    private Fz40ToWhjlSync1212Rep fz40ToWhjlSync1212Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiTriggerRep apiTriggerRep;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * å‡ºå…¥åº“记录信息
     *
     * @param kqdm
     * @param deptId
     * @param start
     * @param end
     */
    public void syncData(String kqdm, String deptId, Date start, Date end) {
        log.info("-------------1212接口数据开始同步------------------");

        //同步数据，只记录失败的信息
        ApiLog apiLog = new ApiLog();
        apiLog.setType(ApiLog.TYPE_SYNC);
        apiLog.setKqdm(deptId);
        apiLog.setUploadTime(new Date());
        apiLog.setInteId(Constant.API_CODE_1212);
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        try {
            List<Fz40WhjlInoutRecord> list = fz40ToWhjlSync1212Rep.listApi1212(deptId);
            List<ApiInfoData> apiInfoDataList;
            WhjlApi1212 apiData;
            for (Fz40WhjlInoutRecord sysData : list) {
                List<ApiInfoData> dept = apiInfoDataRep.getDataByDataId(sysData.getCompanyId());
                WhjlApi1101 whjlApi1101 = JSONObject.parseObject(dept.get(0).getData(), WhjlApi1101.class);
                List<ApiInfoData> deptArea = apiInfoDataRep.getDataByDataId(sysData.getDeptId());
                WhjlApi1102 whjlApi1102 = JSONObject.parseObject(deptArea.get(0).getData(), WhjlApi1102.class);
                apiData = new WhjlApi1212();
                apiData.setCrkid(sysData.getId());
                apiData.setJlqybh(whjlApi1101.getJlqybh());//军粮企业编号
                apiData.setJlqymc(whjlApi1101.getJlqymc());//军粮企业名称
                apiData.setJgzdbh(whjlApi1102.getJgzdbh());//军供站点编码
                apiData.setJgzdmc(whjlApi1102.getJgzdmc());//军供站点名称
                apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[]{"yyyyMMdd"}));
                if(sysData.getType().equals("IN")){
                    apiData.setCrklx("入库");
                    apiData.setYwlx("日常出入库");//出入库类型: æ—¥å¸¸å‡ºå…¥åº“/日常出库/应急入库/应急出库/盘点入库/盘点出库/转仓入库/转仓出库
                }
                if(sysData.getType().equals("OUT")){
                    apiData.setCrklx("出库");
                    apiData.setYwlx("日常出库");//出入库类型: æ—¥å¸¸å‡ºå…¥åº“/日常出库/应急入库/应急出库/盘点入库/盘点出库/转仓入库/转仓出库
                }

//                apiData.setCrkpz("");//出入库凭证
//                apiData.setJljgqybh("");//加工企业编码
//                apiData.setJljgqymc("");//加工企业名称
//                apiData.setKhbh("");//客户编号
//                apiData.setGlzxm("");//客户名称
//                apiData.setShdw("");//收货单位
//                apiData.setShlxr("");//收货联系人
//                apiData.setRjfaid("");//应急方案id
//                apiData.setJhid("");//筹措计划iD
//                apiData.setHtid("");//合同ID
//                apiData.setPsmxid("");//配送任务id

                apiData.setYscch(sysData.getPlateNum());//运输车船号
                apiData.setCyr(sysData.getUserName());//承运人
                apiData.setCyrdh(StringUtils.isBlank(sysData.getUserContact()) ? "18336564986" : sysData.getUserContact());//承运人电话

//                apiData.setBz("");//备注
//                apiData.setCrkmxid("");//出入库明细id


                List<ApiInfoData> dataByDataId = apiInfoDataRep.getDataByDataId(sysData.getDepotId());
                WhjlApi1108 whjlApi1108 = new WhjlApi1108();
                if(dataByDataId != null && dataByDataId.size()>0){
                    whjlApi1108 = JSONObject.parseObject(dataByDataId.get(0).getData(), WhjlApi1108.class);
                }
                apiData.setHwbh(whjlApi1108.getHwbh());//货位编号
                apiData.setHwmc(whjlApi1108.getHwmc());//货位名称
                apiData.setAjbh(apiData.getHwbh().substring(0,28));//廒间编号
                apiData.setAjmc(apiData.getHwmc());// TODO å»’间名称

                apiData.setKctzbh(sysData.getId().substring(2));//库存台账ID
                apiData.setKctzcppcid(sysData.getId().substring(2));//库存台账批次ID
//                apiData.setPsmxid("");//配送车辆明细ID

//                apiData.setYjfamxid("");//应急方案明细ID
                apiData.setLspzbm(sysData.getFoodVariety());//品种编号
                List<ApiTrigger> lspz = apiTriggerRep.findNameByCode(sysData.getFoodVariety(),"LSPZ");
                if(lspz != null && lspz.size() > 0){
                    apiData.setLspzmc(lspz.get(0).getName());//品种名称
                }
                if (sysData.getFoodVariety().equals("2")){

                    //小麦粉
                    apiData.setCpbh("FJL89570583ec0a2571");//产品编号
                    apiData.setCpmc("小麦粉");//产品编号
                }
                if (sysData.getFoodVariety().equals("1")){

                    //大米
                    apiData.setCpbh("FJLdf09130205a43002");//产品编号
                    apiData.setCpmc("大米");//产品编号

                }
                if (sysData.getFoodVariety().equals("3")){

                    //食用油
                    apiData.setCpbh("FJL3e7ba1605ebd5dec");//产品编号
                    apiData.setCpmc("食用油");//产品编号
                }
                apiData.setJldwbm("12");//计量单位编码
                apiData.setJldwmc("千克");//计量单位名称
                apiData.setJsdwbm("21");//计数单位编码
                apiData.setJsdwmc("袋");//计数单位名称

//                apiData.setCrklx("");//出入库类型

                apiData.setCrksl((double) sysData.getBzbjs());//出入库数量
                apiData.setCrkzl(sysData.getSettleWeight());//出入库重量

//                apiData.setQcsl(0.00);//期初数量
//                apiData.setQmsl(0.00);//期末数量
//                apiData.setQczl(0.00);//期初重量
//                apiData.setQmzl(0.00);//期末重量
//                apiData.setShsl(0.00);//损耗数量
//                apiData.setShzl(0.00);//损耗重量
//                apiData.setYsyq("");//验收要求
//                apiData.setSfhx("");//是否核销
//                apiData.setQkxm("");//欠款项目

                apiData.setDj(sysData.getPrice());//单价
                apiData.setJe(apiData.getDj()*apiData.getCrkzl());//金额
                apiData.setCpdj("一等");//产品等级 å…³è”产品接口

//                apiData.setCd("");//产地
//                apiData.setSccj("");//生产厂家
//                apiData.setGg("");//规格型号
//                apiData.setCppc("");//产品批次
//                apiData.setScrq(null);//生产日期
//                apiData.setBzq(null);//保质期
//                apiData.setCkfs("");//出库方式
                apiData.setDjsj(sysData.getRegisterTime());//登记时间
//                apiData.setZz("");//站长
//                apiData.setJjy("");//质检员
                apiData.setSxh(Integer.valueOf(sysData.getId().substring(6)));//顺序号
//                apiData.setDdid("");//订单id
//                apiData.setCrktzdid("");//出入库通知单id
//                apiData.setCrktzdmxid("");//出入库通知单明细ID
//                apiData.setDjr("");//登记人


//                WhjlCheck zjbgwj = new WhjlCheck();
//                zjbgwj.setJybgwjid("");//检验报告文件ID
//                zjbgwj.setJyrq(null);//检验日期
//                zjbgwj.setJylx("");//检验类型
//                zjbgwj.setWjlx("");//文件类型
//                zjbgwj.setWjm("");//文件名
//                zjbgwj.setWjlj("");//文件路径
//                zjbgwj.setWjdx("");//文件大小


                //持久化保存，单独存入非国标接口表
                ApiInfoData infoData = new ApiInfoData();
                infoData.setId(sysData.getId());
                infoData.setKqdm(kqdm);
                infoData.setInteType(WhjlConstant.API_CATEGORY_12);
                infoData.setInteId(WhjlConstant.API_CODE_1212);
                infoData.setUpdateTime(new Date());
                infoData.setDataId(sysData.getId());
                infoData.setRemarks("备注信息");

                //设置操作标志
                apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
                if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                    infoData.setCzbz(Constant.CZBZ_I);
                } else {
                    apiData.setCzbz(apiInfoDataList.get(0).getCzbz());
                    infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
                }

                infoData.setData(JSON.toJSONString(apiData));
                apiInfoDataRep.save(infoData);


                log.info("1212---出入库记录-同步数据：{}", apiData.toString());

            }
        } catch (Exception e) {
            log.error("---1212合同-同步数据执行失败----{}", e.getMessage());
            apiLog.setResult("1212合同信息同步失败：" + e.getMessage());
            apiLogRep.save(apiLog);
        }
    }

}

 src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1212Rep.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.fzzy.async.whhpjl.repository;

import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultContract;
import com.fzzy.async.whhpjl.entity.Fz40WhjlInoutRecord;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

import java.util.List;

/**
 * å‡ºå…¥åº“信息
 *
 */
public interface Fz40ToWhjlSync1212Rep extends JpaRepository<Fz40WhjlInoutRecord, String> {
    /**
     * å‡ºå…¥åº“信息
     *
     * @return
     */
    @Query("from Fz40WhjlInoutRecord where deptId=:deptId ")
    List<Fz40WhjlInoutRecord> listApi1212(@Param("deptId") String deptId);
}

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml

@@ -319,6 +319,7 @@
      <PropertyDef name="sxh">
        <Property></Property>
        <Property name="label">顺序号</Property>
        <Property name="dataType">int</Property>
      </PropertyDef>
      <PropertyDef name="ddid">
        <Property></Property>
@@ -337,32 +338,32 @@
        <Property name="label">登记人</Property>
      </PropertyDef>
      <PropertyDef name="ajmc">
        <Property/>
        <Property></Property>
      </PropertyDef>
      <PropertyDef name="cpdj">
        <Property/>
        <Property></Property>
        <Property name="label">等级</Property>
      </PropertyDef>
      <PropertyDef name="jybgwjid">
        <Property/>
        <Property></Property>
      </PropertyDef>
      <PropertyDef name="jyrq">
        <Property name="dataType">Date</Property>
      </PropertyDef>
      <PropertyDef name="jylx">
        <Property/>
        <Property></Property>
      </PropertyDef>
      <PropertyDef name="wjlx">
        <Property/>
        <Property></Property>
      </PropertyDef>
      <PropertyDef name="wjm">
        <Property/>
        <Property></Property>
      </PropertyDef>
      <PropertyDef name="wjlj">
        <Property/>
        <Property></Property>
      </PropertyDef>
      <PropertyDef name="wjdx">
        <Property/>
        <Property></Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtCrkmx">
@@ -1238,6 +1239,16 @@
            <Property name="property">sxh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dj</Property>
            <Property name="property">dj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">scrq</Property>
            <Property name="property">scrq</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
        <Panel layout="regionPadding:5">
          <Property name="caption">质检报告文件</Property>

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java

@@ -109,7 +109,7 @@
    private Date djsj;  //登记时间
    private String zz;  //站长
    private String jjy;  //质检员
    private String sxh;  //顺序号
    private int sxh;  //顺序号
    //    private String bz;  //备注
    private String ddid;  //订单ID
    private String crktzdid;  //出入库通知单ID

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2001PR.java

@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -122,6 +123,9 @@
        String result = "";
        List<WhjlShareApi2001> list;
        for (ApiConfs apiConf : apiConfs) {
            if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
                continue;
            }
            apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
            if (null == apiService) {
                continue;

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2002PR.java

@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -124,6 +125,9 @@
        String result = "";
        List<WhjlShareApi2002> list;
        for (ApiConfs apiConf : apiConfs) {
            if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
                continue;
            }
            apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
            if (null == apiService) {
                continue;

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2003PR.java

@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -133,10 +134,14 @@
        String result = "";
        List<WhjlShareApi2003> list;
        for (ApiConfs apiConf : apiConfs) {
            if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
                continue;
            }
            apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
            if (null == apiService) {
                continue;
            }

            //封装参数
            param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_20, WhjlConstant.API_CODE_2003);
            responseDto = apiService.pullData(param, apiConf);

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2004PR.java

@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -125,6 +126,9 @@
        String result = "";
        List<WhjlShareApi2004> list;
        for (ApiConfs apiConf : apiConfs) {
            if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
                continue;
            }
            apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
            if (null == apiService) {
                continue;

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2005PR.java

@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -122,6 +123,9 @@
        String result = "";
        List<WhjlShareApi2005> list;
        for (ApiConfs apiConf : apiConfs) {
            if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
                continue;
            }
            apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
            if (null == apiService) {
                continue;

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2006PR.java

@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -124,6 +125,9 @@
        String result = "";
        List<WhjlShareApi2006> list;
        for (ApiConfs apiConf : apiConfs) {
            if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
                continue;
            }
            apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
            if (null == apiService) {
                continue;

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2007PR.java

@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -123,6 +124,9 @@
        String result = "";
        List<WhjlShareApi2007> list;
        for (ApiConfs apiConf : apiConfs) {
            if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
                continue;
            }
            apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
            if (null == apiService) {
                continue;

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2008PR.java

@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -123,6 +124,9 @@
        String result = "";
        List<WhjlShareApi2008> list;
        for (ApiConfs apiConf : apiConfs) {
            if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
                continue;
            }
            apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
            if (null == apiService) {
                continue;

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2009PR.java

@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -123,6 +124,9 @@
        String result = "";
        List<WhjlShareApi2009> list;
        for (ApiConfs apiConf : apiConfs) {
            if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
                continue;
            }
            apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
            if (null == apiService) {
                continue;

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2010PR.java

@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -146,6 +147,9 @@
        String result = "";
        List<WhjlShareApi2010> list;
        for (ApiConfs apiConf : apiConfs) {
            if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
                continue;
            }
            apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
            if (null == apiService) {
                continue;

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2011PR.java

@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -136,6 +137,9 @@
        String result = "";
        List<WhjlShareApi2011> list;
        for (ApiConfs apiConf : apiConfs) {
            if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
                continue;
            }
            apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
            if (null == apiService) {
                continue;