#

luxiaotao1123

2021-08-09 397bc356d3e77a275ade28bd101470a7a344952c

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

@@ -3,8 +3,12 @@
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;
import com.zy.common.model.UploadBill;
import com.zy.common.model.UploadBillDetail;
@@ -27,19 +31,28 @@

    @Value("${erp.url}")
    private String url;
    

    public static final String UPLOAD_BILL = "cM/basis/uploadBill";

    @Autowired
    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);
@@ -63,14 +76,43 @@
                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    // 备注
                ));
            }
            System.out.println(JSON.toJSONString(uploadBill));
            log.warn(JSON.toJSONString(uploadBill));
            String response = new HttpHandler.Builder()
                    .setUri(url)
                    .setPath(UPLOAD_BILL)
                    .setJson(JSON.toJSONString(uploadBill))
                    .build()
                    .doPost();
            try {

                for (DocLog docLog : docLogs) {
                    docLogService.insert(docLog);
                }

                // 日志记录
                RequestLog logInfo = new RequestLog();
                logInfo.setName("单据上传，单据类型" + docId);
                logInfo.setRequest(JSON.toJSONString(uploadBill)); // 入参
                logInfo.setResponse(response); // 出参
                logInfo.setCreateTime(new Date());
                requestLogService.insert(logInfo);
            } catch (Exception e) {
                log.error(e.getMessage());
            }

            if (!Cools.isEmpty(response)) {
                log.warn(response);