Merge remote-tracking branch 'origin/master'

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingDataVO.java

@@ -18,104 +18,110 @@
    /**
     * ç³»ç»ŸæŽ¥å£oid
     */
    private String classifyoid;
    private String classifyOid;

    /**
     * ç³»ç»Ÿid
     */
    private String btmoid;
    private String btmOid;

    /**
     * ç³»ç»Ÿid
     */
    private String btmid;
    private String btmId;

    /**
     * ç³»ç»Ÿid
     */
    private String sendtype;
    private String sendType;


    /***
     * åˆ†ç±»åç§°
     */

    private  String classifyName;

    /**
     * æ˜¯å¦åˆ†è§£ä»»åŠ¡
     */
    private String sendflag;
    private String sendFlag;


    /**
     * ç³»ç»Ÿid
     */
    private String classifyid;
    private String classifyId;

    public String getClassifyOid() {
        return classifyOid;
    }

    public void setClassifyOid(String classifyOid) {
        this.classifyOid = classifyOid;
    }

    public String getBtmOid() {
        return btmOid;
    }

    public void setBtmOid(String btmOid) {
        this.btmOid = btmOid;
    }

    public String getBtmId() {
        return btmId;
    }

    public void setBtmId(String btmId) {
        this.btmId = btmId;
    }

    public String getSendType() {
        return sendType;
    }

    public void setSendType(String sendType) {
        this.sendType = sendType;
    }

    public String getSendFlag() {
        return sendFlag;
    }

    public void setSendFlag(String sendFlag) {
        this.sendFlag = sendFlag;
    }

    public String getClassifyId() {
        return classifyId;
    }

    public void setClassifyId(String classifyId) {
        this.classifyId = classifyId;
    }

    public String getClassifyName() {
        return classifyName;
    }

    public void setClassifyName(String classifyName) {
        this.classifyName = classifyName;
    }

    /**
     * ç³»ç»Ÿid
     */
    private String classifyname;

    public String getClassifyoid() {
        return classifyoid;
    }

    public void setClassifyoid(String classifyoid) {
        this.classifyoid = classifyoid;
    }

    public String getBtmoid() {
        return btmoid;
    }

    public void setBtmoid(String btmoid) {
        this.btmoid = btmoid;
    }

    public String getBtmid() {
        return btmid;
    }

    public void setBtmid(String btmid) {
        this.btmid = btmid;
    }

    public String getSendtype() {
        return sendtype;
    }

    public void setSendtype(String sendtype) {
        this.sendtype = sendtype;
    }

    public String getSendflag() {
        return sendflag;
    }

    public void setSendflag(String sendflag) {
        this.sendflag = sendflag;
    }

    public String getClassifyid() {
        return classifyid;
    }

    public void setClassifyid(String classifyid) {
        this.classifyid = classifyid;
    }

    public String getClassifyname() {
        return classifyname;
    }

    public void setClassifyname(String classifyname) {
        this.classifyname = classifyname;
    }

    @Override
    public String toString() {
        return "DockingDataDO{" +
                "classifyoid='" + classifyoid + '\'' +
                ", btmoid='" + btmoid + '\'' +
                ", btmid='" + btmid + '\'' +
                ", sendtype='" + sendtype + '\'' +
                ", sendflag='" + sendflag + '\'' +
                ", classifyid='" + classifyid + '\'' +
                ", classifyname='" + classifyname + '\'' +
        return "DockingDataVO{" +
            "classifyOid='" + classifyOid + '\'' +
            ", btmOid='" + btmOid + '\'' +
            ", btmId='" + btmId + '\'' +
            ", sendType='" + sendType + '\'' +
            ", classifyName='" + classifyName + '\'' +
            ", sendFlag='" + sendFlag + '\'' +
            ", classifyId='" + classifyId + '\'' +
                '}';
    }
}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java

@@ -1,6 +1,7 @@
package com.vci.ubcs.code.vo.pagemodel;

import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModelProperty;

/**
 * èµ„源对接通知、查询接口日志显示对象
@@ -15,46 +16,63 @@
     */
    private static final long serialVersionUID = 4615707121064918548L;

    private  String uniqueCode;
    /**
     * åˆ†ç±»oid
     */
    private String classifyOid;
    /**
     * åˆ†ç±»id
     */
    private String classifyId;
    /**
     * åˆ†ç±»name
     */
    private String classifyName;
    /**
    * æŽ¥å£çŠ¶æ€
    */
    private String interfacestatus;
    private String interfaceStatus;


    /**
    * å‚æ•°
    */
    private String paramstring;
    private String paramString;


    /**
    * è¿”回
    */
    private String returnstring;
    private String returnString;


    /**
    * ç³»ç»Ÿç¼–号
    */
    private String systemcode;
    private String systemCode;


    /**
    * ç³»ç»Ÿåç§°
    */
    private String systemname;
    private String systemName;


    /**
    * ç³»ç»Ÿid
    */
    private String systemoid;
    private String systemOid;


    /**
    * æŽ¥å£ç±»åž‹
    */
    private String type;
    /**
     * ä¼ é€’xml
     */
    private String sendXml;

    /**
     * è¿”还提示
@@ -69,84 +87,54 @@
        this.msg = msg;
    }

    /**
     * èŽ·å– æŽ¥å£çŠ¶æ€
     */
    public String getInterfacestatus (){
        return interfacestatus;
    public String getInterfaceStatus() {
        return interfaceStatus;
    }

    /**
    * è®¾ç½® æŽ¥å£çŠ¶æ€
    */
    public void setInterfacestatus (String interfacestatus){
        this.interfacestatus = interfacestatus;
    }
    /**
     * èŽ·å– å‚æ•°
     */
    public String getParamstring (){
        return paramstring;
    public void setInterfaceStatus(String interfaceStatus) {
        this.interfaceStatus = interfaceStatus;
    }

    /**
    * è®¾ç½® å‚æ•°
    */
    public void setParamstring (String paramstring){
        this.paramstring = paramstring;
    }
    /**
     * èŽ·å– è¿”回
     */
    public String getReturnstring (){
        return returnstring;
    public String getParamString() {
        return paramString;
    }

    /**
    * è®¾ç½® è¿”回
    */
    public void setReturnstring (String returnstring){
        this.returnstring = returnstring;
    }
    /**
     * èŽ·å– ç³»ç»Ÿç¼–号
     */
    public String getSystemcode (){
        return systemcode;
    public void setParamString(String paramString) {
        this.paramString = paramString;
    }

    /**
    * è®¾ç½® ç³»ç»Ÿç¼–号
    */
    public void setSystemcode (String systemcode){
        this.systemcode = systemcode;
    }
    /**
     * èŽ·å– ç³»ç»Ÿåç§°
     */
    public String getSystemname (){
        return systemname;
    public String getReturnString() {
        return returnString;
    }

    /**
    * è®¾ç½® ç³»ç»Ÿåç§°
    */
    public void setSystemname (String systemname){
        this.systemname = systemname;
    }
    /**
     * èŽ·å– ç³»ç»Ÿid
     */
    public String getSystemoid (){
        return systemoid;
    public void setReturnString(String returnString) {
        this.returnString = returnString;
    }

    /**
    * è®¾ç½® ç³»ç»Ÿid
    */
    public void setSystemoid (String systemoid){
        this.systemoid = systemoid;
    public String getSystemCode() {
        return systemCode;
    }

    public void setSystemCode(String systemCode) {
        this.systemCode = systemCode;
    }

    public String getSystemName() {
        return systemName;
    }

    public void setSystemName(String systemName) {
        this.systemName = systemName;
    }

    public String getSystemOid() {
        return systemOid;
    }

    public void setSystemOid(String systemOid) {
        this.systemOid = systemOid;
    }

    /**
     * èŽ·å– æŽ¥å£ç±»åž‹
     */
@@ -161,16 +149,61 @@
        this.type = type;
    }

    public String getUniqueCode() {
        return uniqueCode;
    }

    public void setUniqueCode(String uniqueCode) {
        this.uniqueCode = uniqueCode;
    }

    public String getClassifyOid() {
        return classifyOid;
    }

    public void setClassifyOid(String classifyOid) {
        this.classifyOid = classifyOid;
    }

    public String getClassifyId() {
        return classifyId;
    }

    public void setClassifyId(String classifyId) {
        this.classifyId = classifyId;
    }

    public String getClassifyName() {
        return classifyName;
    }

    public void setClassifyName(String classifyName) {
        this.classifyName = classifyName;
    }

    public String getSendXml() {
        return sendXml;
    }

    public void setSendXml(String sendXml) {
        this.sendXml = sendXml;
    }

    @Override
    public String toString() {
        return "DockingLogeVO{" +
                "interfacestatus='" + interfacestatus + '\'' +
                ", paramstring='" + paramstring + '\'' +
                ", returnstring='" + returnstring + '\'' +
                ", systemcode='" + systemcode + '\'' +
                ", systemname='" + systemname + '\'' +
                ", systemoid='" + systemoid + '\'' +
            "uniqueCode='" + uniqueCode + '\'' +
            ", classifyOid='" + classifyOid + '\'' +
            ", classifyId='" + classifyId + '\'' +
            ", classifyName='" + classifyName + '\'' +
            ", interfaceStatus='" + interfaceStatus + '\'' +
            ", paramString='" + paramString + '\'' +
            ", returnString='" + returnString + '\'' +
            ", systemCode='" + systemCode + '\'' +
            ", systemName='" + systemName + '\'' +
            ", systemOid='" + systemOid + '\'' +
                ", type='" + type + '\'' +
            ", sendXml='" + sendXml + '\'' +
                ", msg='" + msg + '\'' +
                '}';
    }

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingTaskVO.java

@@ -93,6 +93,126 @@
     */
    private String dataOid;

    public String getSysInfoOid() {
        return sysInfoOid;
    }

    public void setSysInfoOid(String sysInfoOid) {
        this.sysInfoOid = sysInfoOid;
    }

    public String getSystemOid() {
        return systemOid;
    }

    public void setSystemOid(String systemOid) {
        this.systemOid = systemOid;
    }

    public String getSystemCode() {
        return systemCode;
    }

    public void setSystemCode(String systemCode) {
        this.systemCode = systemCode;
    }

    public String getSystemName() {
        return systemName;
    }

    public void setSystemName(String systemName) {
        this.systemName = systemName;
    }

    public String getClassifyOid() {
        return classifyOid;
    }

    public void setClassifyOid(String classifyOid) {
        this.classifyOid = classifyOid;
    }

    public String getClassifyId() {
        return classifyId;
    }

    public void setClassifyId(String classifyId) {
        this.classifyId = classifyId;
    }

    public String getClassifyName() {
        return classifyName;
    }

    public void setClassifyName(String classifyName) {
        this.classifyName = classifyName;
    }

    public String getBtmOid() {
        return btmOid;
    }

    public void setBtmOid(String btmOid) {
        this.btmOid = btmOid;
    }

    public String getBtmId() {
        return btmId;
    }

    public void setBtmId(String btmId) {
        this.btmId = btmId;
    }

    public String getUniqueCode() {
        return uniqueCode;
    }

    public void setUniqueCode(String uniqueCode) {
        this.uniqueCode = uniqueCode;
    }

    public String getSendType() {
        return sendType;
    }

    public void setSendType(String sendType) {
        this.sendType = sendType;
    }

    public String getSendTypeText() {
        return sendTypeText;
    }

    public void setSendTypeText(String sendTypeText) {
        this.sendTypeText = sendTypeText;
    }

    public String getSendFlag() {
        return sendFlag;
    }

    public void setSendFlag(String sendFlag) {
        this.sendFlag = sendFlag;
    }

    public String getSendFlagText() {
        return sendFlagText;
    }

    public void setSendFlagText(String sendFlagText) {
        this.sendFlagText = sendFlagText;
    }

    public String getDataOid() {
        return dataOid;
    }

    public void setDataOid(String dataOid) {
        this.dataOid = dataOid;
    }

    @Override
    public String toString() {
        return "DockingTaskVO{" +

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.json

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,122 @@
{
    "data": {
        "object": {
            "code": "02010200028",
            "status": "Released",
            "library": "wupin",
            "classCode": "020102",
            "pro": [
                {
                    "filedName": "xiaoshouwl",
                    "outname": "销售物料",
                    "filedValue": "false"
                },
                {
                    "filedName": "xinghaoguige",
                    "outname": "规格型号",
                    "filedValue": ""
                },
                {
                    "filedName": "createtime",
                    "outname": "创建时间",
                    "filedValue": ""
                },
                {
                    "filedName": "creator",
                    "outname": "创建人",
                    "filedValue": "weidy"
                },
                {
                    "filedName": "lastmodifier",
                    "outname": "最后修改人",
                    "filedValue": ""
                },
                {
                    "filedName": "secondfl",
                    "outname": "二级管理分类",
                    "filedValue": "分类树上没有层级[none]"
                },
                {
                    "filedName": "caigouwl",
                    "outname": "采购物料",
                    "filedValue": "false"
                },
                {
                    "filedName": "tuhao",
                    "outname": "图号",
                    "filedValue": "TH-0033"
                },
                {
                    "filedName": "kucunwl",
                    "outname": "库存物料",
                    "filedValue": "false"
                },
                {
                    "filedName": "shifoupihaoguanli",
                    "outname": "是否批号管理",
                    "filedValue": "false"
                },
                {
                    "filedName": "thrifl",
                    "outname": "三级管理分类",
                    "filedValue": "分类树上没有层级[none]"
                },
                {
                    "filedName": "revisionvalue",
                    "outname": "版本",
                    "filedValue": ""
                },
                {
                    "filedName": "firstfl",
                    "outname": "一级管理分类",
                    "filedValue": "分类树上没有层级[none]"
                },
                {
                    "filedName": "chukufangshi",
                    "outname": "出库方式",
                    "filedValue": "先进先出"
                },
                {
                    "filedName": "hesuanfenlei",
                    "outname": "核算分类",
                    "filedValue": ""
                },
                {
                    "filedName": "jiliangdw",
                    "outname": "计量单位",
                    "filedValue": ""
                },
                {
                    "filedName": "oldcode",
                    "outname": "历史编号",
                    "filedValue": ""
                },
                {
                    "filedName": "materialclassify",
                    "outname": "物料分类",
                    "filedValue": "020102"
                },
                {
                    "filedName": "id",
                    "outname": "代号",
                    "filedValue": "02010200028"
                },
                {
                    "filedName": "morengongys",
                    "outname": "供应商",
                    "filedValue": ""
                },
                {
                    "filedName": "lcstatus",
                    "outname": "状态",
                    "filedValue": "Released"
                },
                {
                    "filedName": "zuixiaoqiding",
                    "outname": "最小起订量",
                    "filedValue": ""
                }
            ]
        }
    }
}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<data>
    <object code="02010200028" status="Released" library="wupin" classCode="020102">
        <pro filedName="xiaoshouwl" outname="销售物料" filedValue="false"/>
        <pro filedName="xinghaoguige" outname="规格型号" filedValue=""/>
        <pro filedName="createtime" outname="创建时间" filedValue=""/>
        <pro filedName="creator" outname="创建人" filedValue="weidy"/>
        <pro filedName="lastmodifier" outname="最后修改人" filedValue=""/>
        <pro filedName="secondfl" outname="二级管理分类" filedValue="分类树上没有层级[none]"/>
        <pro filedName="caigouwl" outname="采购物料" filedValue="false"/>
        <pro filedName="tuhao" outname="图号" filedValue="TH-0033"/>
        <pro filedName="kucunwl" outname="库存物料" filedValue="false"/>
        <pro filedName="shifoupihaoguanli" outname="是否批号管理" filedValue="false"/>
        <pro filedName="thrifl" outname="三级管理分类" filedValue="分类树上没有层级[none]"/>
        <pro filedName="revisionvalue" outname="版本" filedValue=""/>
        <pro filedName="firstfl" outname="一级管理分类" filedValue="分类树上没有层级[none]"/>
        <pro filedName="chukufangshi" outname="出库方式" filedValue="先进先出"/>
        <pro filedName="hesuanfenlei" outname="核算分类" filedValue=""/>
        <pro filedName="jiliangdw" outname="计量单位" filedValue=""/>
        <pro filedName="oldcode" outname="历史编号" filedValue=""/>
        <pro filedName="materialclassify" outname="物料分类" filedValue="020102"/>
        <pro filedName="id" outname="代号" filedValue="02010200028"/>
        <pro filedName="morengongys" outname="供应商" filedValue=""/>
        <pro filedName="lcstatus" outname="状态" filedValue="Released"/>
        <pro filedName="zuixiaoqiding" outname="最小起订量" filedValue=""/>
    </object>
</data>

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java

@@ -244,7 +244,7 @@
            }

            if(dockingTask_insert.size()!=0) {
//                dockingTaskService.saveBatch(dockingTask_insert);
                dockingTaskService.saveBatch(dockingTask_insert);
            }
            //dockingTaskDaoI.updateByPrimaryKey方法报错了，所以手写了这个
            boolean u = updateDockingDatasSendFlag(dataoid,SEND_FLAG_TRUE);
@@ -360,8 +360,10 @@
                });
                //查询推送接口参数
                DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid);

                boolean isGroupCodeFlage= dockingSystemConfig.getIsGroupCodeFlag().equals("true")?true:false;
                boolean isGroupCodeFlage=false;
                if(dockingSystemConfig!=null) {
                    isGroupCodeFlage = StringUtils.isBlank(dockingSystemConfig.getIsGroupCodeFlag())?false: Boolean.getBoolean(dockingSystemConfig.getIsGroupCodeFlag());
                }
                if(isGroupCodeFlage){
                    code=data.getOrDefault("groupcode","");
                }

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java

@@ -32,6 +32,12 @@
    private IDockingLogeService dockingLogeService;

    /***
     * é›†æˆä»»åŠ¡æœåŠ¡
     */
    @Autowired( required = false)
    private IDockingTaskService dockingTaskService;

    /***
     * é›†æˆæŽ¥å£å¤´åè®®æœåŠ¡
     */
    @Autowired( required = false)
@@ -54,8 +60,7 @@
     */
    @Override
    public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) {
        IPage<DockingTask> pages=null;
//        IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
        IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
        return DockingTaskWrapper.build().pageVO(pages);
    }