Merge remote-tracking branch 'origin/htwms' into htwms

王佳豪

2021-06-01 391ea14026d1fe6417d4ce88ebedc6654b6519ad

 src/main/java/zy/cloud/wms/common/service/erp/ErpService.java

@@ -11,8 +11,10 @@
import zy.cloud.wms.common.service.erp.entity.UploadBillDetail;
import zy.cloud.wms.manager.entity.DocType;
import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.entity.RequestLog;
import zy.cloud.wms.manager.service.DocTypeService;
import zy.cloud.wms.manager.service.MatService;
import zy.cloud.wms.manager.service.RequestLogService;
import zy.cloud.wms.manager.utils.HttpHandler;

import java.util.ArrayList;
@@ -30,13 +32,12 @@
    private DocTypeService docTypeService;
    @Autowired
    private MatService matService;
    @Autowired
    private RequestLogService requestLogService;
    /**
     * 单据上报
     */
    public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
        if (true) {
//            return true;
        }
        try {
            if (Cools.isEmpty(dtos)) {
                return false;
@@ -69,7 +70,7 @@
                detl.setUnit(mat==null?"暂无":mat.getUnit());
                detail.add(detl);
            }
            System.out.println(JSON.toJSONString(uploadBill));
            log.warn(JSON.toJSONString(uploadBill));
            String response = new HttpHandler.Builder()
                    .setUri(ErpScheduler.URI)
                    .setPath(ErpScheduler.UPLOAD_BILL)
@@ -77,6 +78,19 @@
                    .build()
                    .doPost();

            try {
                // 日志记录
                RequestLog logInfo = new RequestLog();
                logInfo.setName("单据上传，单据类型" + docId.toString());
                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);
                Result result = JSON.parseObject(response, Result.class);