#

luxiaotao1123

2021-08-08 5ee50ab49acbafef81759528eb12f05c76725339

#

 src/main/java/com/zy/asrs/entity/DocLog.java

New file
@@ -0,0 +1,193 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;

@TableName("erp_doc_log")
public class DocLog implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    private Long id;

    /**
     * 单据编号
     */
    @ApiModelProperty(value= "单据编号")
    @TableField("doc_num")
    private String docNum;

    /**
     * 单据类型
     */
    @ApiModelProperty(value= "单据类型")
    @TableField("doc_id")
    private Long docId;

    /**
     * 单据名称
     */
    @ApiModelProperty(value= "单据名称")
    @TableField("doc_name")
    private String docName;

    /**
     * 商品编号
     */
    @ApiModelProperty(value= "商品编号")
    private String matnr;

    /**
     * 上报数量
     */
    @ApiModelProperty(value= "上报数量")
    private Double qua;

    /**
     * 结果 1: 成功  0: 失败  
     */
    @ApiModelProperty(value= "结果 1: 成功  0: 失败  ")
    private Integer success;

    /**
     * 上报时间
     */
    @ApiModelProperty(value= "上报时间")
    @TableField("send_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date sendTime;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    public DocLog() {}

    public DocLog(String docNum, Long docId, String docName, String matnr, Double qua, Integer success, Date sendTime, String memo) {
        this.docNum = docNum;
        this.docId = docId;
        this.docName = docName;
        this.matnr = matnr;
        this.qua = qua;
        this.success = success;
        this.sendTime = sendTime;
        this.memo = memo;
    }

//    DocLog docLog = new DocLog(
//            null,    // 单据编号
//            null,    // 单据类型
//            null,    // 单据名称
//            null,    // 商品编号
//            null,    // 上报数量
//            null,    // 结果
//            null,    // 上报时间
//            null    // 备注
//    );

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public String getDocNum() {
        return docNum;
    }

    public void setDocNum(String docNum) {
        this.docNum = docNum;
    }

    public Long getDocId() {
        return docId;
    }

    public void setDocId(Long docId) {
        this.docId = docId;
    }

    public String getDocName() {
        return docName;
    }

    public void setDocName(String docName) {
        this.docName = docName;
    }

    public String getMatnr() {
        return matnr;
    }

    public void setMatnr(String matnr) {
        this.matnr = matnr;
    }

    public Double getQua() {
        return qua;
    }

    public void setQua(Double qua) {
        this.qua = qua;
    }

    public Integer getSuccess() {
        return success;
    }

    public String getSuccess$(){
        if (null == this.success){ return null; }
        switch (this.success){
            case 1:
                return "成功";
            case 0:
                return "失败";
            default:
                return String.valueOf(this.success);
        }
    }

    public void setSuccess(Integer success) {
        this.success = success;
    }

    public Date getSendTime() {
        return sendTime;
    }

    public String getSendTime$(){
        if (Cools.isEmpty(this.sendTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
    }

    public void setSendTime(Date sendTime) {
        this.sendTime = sendTime;
    }

    public String getMemo() {
        return memo;
    }

    public void setMemo(String memo) {
        this.memo = memo;
    }


}

 src/main/java/com/zy/asrs/mapper/DocLogMapper.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.DocLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface DocLogMapper extends BaseMapper<DocLog> {

}

 src/main/java/com/zy/asrs/service/DocLogService.java

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.DocLog;

public interface DocLogService extends IService<DocLog> {

}

 src/main/java/com/zy/asrs/service/impl/DocLogServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.DocLog;
import com.zy.asrs.mapper.DocLogMapper;
import com.zy.asrs.service.DocLogService;
import org.springframework.stereotype.Service;

@Service("docLogService")
public class DocLogServiceImpl extends ServiceImpl<DocLogMapper, DocLog> implements DocLogService {

}

 src/main/java/com/zy/common/service/ErpService.java

@@ -3,8 +3,10 @@
import com.alibaba.fastjson.JSON;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.zy.asrs.entity.DocLog;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.RequestLog;
import com.zy.asrs.service.DocLogService;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.service.RequestLogService;
import com.zy.common.model.BillDto;
@@ -36,15 +38,21 @@
    private MatCodeService matCodeService;
    @Autowired
    private RequestLogService requestLogService;
    @Autowired
    private DocLogService docLogService;

    /**
     * 单据上报
     */
    public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
        try {
            Date now = new Date();
            if (Cools.isEmpty(dtos)) {
                return false;
            }

            // 日志
            List<DocLog> docLogs = new ArrayList<>();

            UploadBill uploadBill = new UploadBill();
            uploadBill.setNumber(docNumber);
@@ -68,6 +76,19 @@
                detl.setPrice(0);
                detl.setUnit(mat==null?"暂无":"箱");
                detail.add(detl);


                // 日志
                docLogs.add(new DocLog(
                        docNumber,    // 单据编号
                        docId.longValue(),    // 单据类型
                        null,    // 单据名称
                        dto.getMatnr(),    // 商品编号
                        dto.getQty(),    // 上报数量
                        1,    // 结果
                        now,    // 上报时间
                        null    // 备注
                ));
            }
            log.warn(JSON.toJSONString(uploadBill));
            String response = new HttpHandler.Builder()
@@ -77,6 +98,9 @@
                    .build()
                    .doPost();
            try {

                docLogService.insertBatch(docLogs);

                // 日志记录
                RequestLog logInfo = new RequestLog();
                logInfo.setName("单据上传，单据类型" + docId);

 src/main/resources/mapper/DocLogMapper.xml

New file
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="zy.cloud.wms.manager.mapper.DocLogMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.DocLog">
        <id column="id" property="id" />
        <result column="doc_num" property="docNum" />
        <result column="doc_id" property="docId" />
        <result column="doc_name" property="docName" />
        <result column="matnr" property="matnr" />
        <result column="qua" property="qua" />
        <result column="success" property="success" />
        <result column="send_time" property="sendTime" />
        <result column="memo" property="memo" />

    </resultMap>

</mapper>