xiejun
2023-09-28 d560ea0f6d13c6bc309cd41603fe4bc8914a2c12
集成接口参数配置修改
已修改5个文件
已添加2个文件
59 ■■■■ 文件已修改
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/data.xml 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/result.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmEngineConstant.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/data.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<data>
    <object itemId="" code="0020010012000000003330010243" status="Released" library="wupin" classCode="020201">
        <pro filedName="xiaoshouwl" outname="销售物料" filedValue="22"/>
        <pro filedName="xinghaoguige" outname="规格型号" filedValue=""/>
        <pro filedName="createtime" outname="创建时间" filedValue="2023-09-05 21:37:37.668"/>
        <pro filedName="creator" outname="创建人" filedValue="0"/>
        <pro filedName="lastmodifier" outname="最后修改人" filedValue="0"/>
        <pro filedName="secondfl" outname="二级管理分类" filedValue="标准件"/>
        <pro filedName="caigouwl" outname="采购物料" filedValue="22"/>
        <pro filedName="tuhao" outname="图号" filedValue="2"/>
        <pro filedName="kucunwl" outname="库存物料" filedValue="2"/>
        <pro filedName="shifoupihaoguanli" outname="是否批号管理" filedValue="22"/>
        <pro filedName="thrifl" outname="三级管理分类" filedValue="锁"/>
        <pro filedName="revisionvalue" outname="版本" filedValue=""/>
        <pro filedName="firstfl" outname="一级管理分类" filedValue="物品"/>
        <pro filedName="chukufangshi" outname="出库方式" filedValue=""/>
        <pro filedName="hesuanfenlei" outname="核算分类" filedValue="F06FFFA8-F334-0CB6-9147-4A14DCC09B08"/>
        <pro filedName="jiliangdw" outname="计量单位" filedValue="1673904662408990721"/>
        <pro filedName="oldcode" outname="历史编号" filedValue="22"/>
        <pro filedName="materialclassify" outname="物料分类" filedValue="020201"/>
        <pro filedName="id" outname="代号" filedValue="0020010012000000003330010243"/>
        <pro filedName="morengongys" outname="供应商" filedValue=""/>
        <pro filedName="lcstatus" outname="状态" filedValue="Released"/>
        <pro filedName="zuixiaoqiding" outname="最小起订量" filedValue="2"/>
    </object>
</data>
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/result.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<data>
    <object erroid="0"  msg="测试成功" code="0201040133" itemId="0000001">
    </object>
</data>
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java
@@ -14,7 +14,7 @@
     * æ•°æ®oid
     */
    @XStreamAsAttribute
    private  String oid;
    private  String itemid;
    /***
     * é”™è¯¯æ ‡è¯†
     */
@@ -34,15 +34,15 @@
        this.code = code;
    }
    public String getOid() {
        return oid;
    }
    public String getItemid() {
        return itemid;
    }
    public void setOid(String oid) {
        this.oid = oid;
    }
    public void setItemid(String itemid) {
        this.itemid = itemid;
    }
    public String getErroid() {
    public String getErroid() {
        return erroid;
    }
@@ -62,7 +62,7 @@
    public String toString() {
        return "ResultNodeObjectDTO{" +
                "code='" + code + '\'' +
                ", oid='" + oid + '\'' +
                ", oid='" + itemid + '\'' +
                ", erroid='" + erroid + '\'' +
                ", msg='" + msg + '\'' +
                '}';
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmEngineConstant.java
@@ -42,7 +42,7 @@
    /**
     * ç æ®µçš„长度的字段,-这不是数据库里的字段
     */
    public static final String CODE_SEC_LENGTH_FIELD = "codeSecLengthField";
    public static final String CODE_SEC_LENGTH_FIELD = "codeseclengthfield";
    /**
     * å¯†çº§çš„字段
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -516,7 +516,7 @@
            resultNodeObjectDTO.setErroid("1");
            resultNodeObjectDTO.setMsg(msg);
            resultNodeObjectDTO.setCode(dockingSystemConfig.getPushType().equalsIgnoreCase("2")?dockingTask.getClassifyId():dockingTask.getId());
            resultNodeObjectDTO.setOid(dockingTask.getBtmOid());
            resultNodeObjectDTO.setItemid(dockingTask.getBtmOid());
            resultNodeObjectDTOS.add(resultNodeObjectDTO);
        }finally {
            boolean isSend = false;
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -645,7 +645,7 @@
            resultNodeObjectDTO.setErroid("1");
            resultNodeObjectDTO.setMsg(msg);
            resultNodeObjectDTO.setCode(dockingSystemConfigDTO.getClassifyId());
            resultNodeObjectDTO.setOid(dockingSystemConfigDTO.getClassifyOid());
            resultNodeObjectDTO.setItemid(dockingSystemConfigDTO.getClassifyOid());
            resultNodeObjectDTOS.add(resultNodeObjectDTO);
        }finally {
            boolean isSend = false;
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -1394,7 +1394,8 @@
        //set给表格配置属性
        uiFormReferVO.setTableConfig(uiTableConfigVO);
        //字段名不一致,需要手动set
        uiFormReferVO.setMuti(Func.toBoolean(codeReferConfig.getIsMuti()));
        uiFormReferVO.setMuti(StringUtils.isBlank(codeReferConfig.getIsMuti())?false:true);
        uiFormReferVO.setInitSort(new UIFieldSortVO(codeReferConfig.getSortField(),codeReferConfig.getSortType()));
        // ç­›é€‰æ¡ä»¶
        HashMap<String, String> whereMap = new HashMap<>();