对接

zhang

2025-09-29 359ffffec540f2645af8071d5aff0a6cd55db160

对接

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -51,7 +51,8 @@
                        log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                    }
                }catch (Exception e){
                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                    e.printStackTrace();
                    log.error("单据[orderNo={}]上报erp报错", order.getOrderNo());
                }
            }
        }

 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -54,6 +54,9 @@
            return SUCCESS;
        }
        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
        if (orderDetls.isEmpty()){
            return SUCCESS;
        }
        // 入库完成上报
        if (docType.getPakin() == 1) {
            ExdInstockTarget exdInstockTarge = null;
@@ -69,9 +72,9 @@
                exdInstockTarge.setWritor("WMS");
                exdInstockTarge.setStatus(0);
                exdInstockTargetService.insert(exdInstockTarge);
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
                    throw new CoolException("服务器内部错误，请联系管理员");
                }
            }
            if (!orderService.updateSettle(order.getId(), 6L, null)) {
                throw new CoolException("服务器内部错误，请联系管理员");
            }
        } else if (docType.getPakout() == 1) {
            // 出库完成上报
@@ -94,9 +97,10 @@
                exdOutstockTarget.setWritor("WMS");
                exdOutstockTarget.setStatus(0);
                exdOutstockTargetService.insert(exdOutstockTarget);
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
                    throw new CoolException("服务器内部错误，请联系管理员");
                }

            }
            if (!orderService.updateSettle(order.getId(), 6L, null)) {
                throw new CoolException("服务器内部错误，请联系管理员");
            }
        }
        return SUCCESS;

 src/main/java/com/zy/third/entity/ExdInstockSource.java

@@ -6,6 +6,8 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;

/**
@@ -18,8 +20,8 @@
    /**
     * 
     */
    @TableId
    private Long id;
    @TableId(value = "ID", type = IdType.AUTO)
    private String ID;

    /**
     * 

 src/main/java/com/zy/third/entity/ExdInstockTarget.java

@@ -6,6 +6,8 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;

/**
@@ -18,8 +20,8 @@
    /**
     * 
     */
    @TableId
    private Long id;
    @TableId(value = "ID", type = IdType.AUTO)
    private String ID;

    /**
     * 

 src/main/java/com/zy/third/entity/ExdOutstockSource.java

@@ -6,6 +6,8 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;

/**
@@ -18,8 +20,8 @@
    /**
     * 
     */
    @TableId
    private Long id;
    @TableId(value = "ID", type = IdType.AUTO)
    private String ID;

    /**
     * 

 src/main/java/com/zy/third/entity/ExdOutstockTarget.java

@@ -6,6 +6,8 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;

/**
@@ -18,8 +20,8 @@
    /**
     * 
     */
    @TableId
    private Long id;
    @TableId(value = "ID", type = IdType.AUTO)
    private String ID;

    /**
     * 

 src/main/java/com/zy/third/task/handler/BaseDataHandler.java

@@ -39,10 +39,17 @@
            user.setUsername(exdUser.getName());
            user.setNickname(exdUser.getName());
            user.setMobile(exdUser.getName());
            user.setEmail(exdUser.getId());
            user.setRoleId(2L);
            user.setCreateTime(new Date());
            user.setStatus(1);
            userService.insert(user);
        }else {
            user.setUsername(exdUser.getName());
            user.setNickname(exdUser.getName());
            user.setMobile(exdUser.getName());
            user.setEmail(exdUser.getId());
            userService.updateById(user);
        }
        return SUCCESS;
    }

 src/main/resources/mapper/third/ExdInstockSourceMapper.xml

@@ -5,7 +5,7 @@
<mapper namespace="com.zy.third.mapper.ExdInstockSourceMapper">

    <resultMap id="BaseResultMap" type="com.zy.third.entity.ExdInstockSource">
            <id property="id" column="ID" />
            <id property="ID" column="ID" />
            <result property="finterid" column="FInterID" />
            <result property="fbillno" column="FBillNo" />
            <result property="ftrantype" column="FTranType" />

 src/main/resources/mapper/third/ExdInstockTargetMapper.xml

@@ -5,7 +5,7 @@
<mapper namespace="com.zy.third.mapper.ExdInstockTargetMapper">

    <resultMap id="BaseResultMap" type="com.zy.third.entity.ExdInstockTarget">
            <id property="id" column="ID" />
            <id property="ID" column="ID" />
            <result property="finterid" column="FInterID" />
            <result property="fbillno" column="FBillNo" />
            <result property="ftrantype" column="FTranType" />

 src/main/resources/mapper/third/ExdOutstockSourceMapper.xml

@@ -5,7 +5,7 @@
<mapper namespace="com.zy.third.mapper.ExdOutstockSourceMapper">

    <resultMap id="BaseResultMap" type="com.zy.third.entity.ExdOutstockSource">
            <id property="id" column="ID" />
            <id property="ID" column="ID" />
            <result property="finterid" column="FInterID" />
            <result property="fbillno" column="FBillNo" />
            <result property="ftrantype" column="FTranType" />

 src/main/resources/mapper/third/ExdOutstockTargetMapper.xml

@@ -5,7 +5,7 @@
<mapper namespace="com.zy.third.mapper.ExdOutstockTargetMapper">

    <resultMap id="BaseResultMap" type="com.zy.third.entity.ExdOutstockTarget">
            <id property="id" column="ID" />
            <id property="ID" column="ID" />
            <result property="finterid" column="FInterID" />
            <result property="fbillno" column="FBillNo" />
            <result property="ftrantype" column="FTranType" />

 src/main/webapp/static/js/user/user.js

@@ -29,7 +29,7 @@
            ,{field: 'mobile', align: 'center',title: '手机号'}
            // ,{field: 'deptName', align: 'center',title: '所属部门'}
            ,{field: 'roleName', align: 'center',title: '角色'}
            ,{field: 'email', align: 'center',title: '邮箱'}
            ,{field: 'email', align: 'center',title: 'ERP中用户id'}
            // ,{field: 'sex$', align: 'center',title: '性别'}
            ,{field: 'createTime$', align: 'center',title: '注册时间', hide: true}
            ,{field: 'status$', align: 'center',title: '状态', templet: '#statusTpl', width: 120, unresize: true}