#

luxiaotao1123

2021-09-28 1d8f4f462fc4be2437dbfa7ad9b5b503019a1193

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

@@ -17,6 +17,7 @@
import zy.cloud.wms.common.service.erp.entity.*;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.mapper.MatCodeMapper;
import zy.cloud.wms.manager.mapper.TagMapper;
import zy.cloud.wms.manager.service.*;
import zy.cloud.wms.manager.utils.HttpHandler;
@@ -65,6 +66,11 @@
    private NodeService nodeService;
    @Autowired
    private DocLogService docLogService;
    @Autowired
    private RequestLogService requestLogService;
    @Autowired
    private MatCodeMapper matCodeMapper;


    /**
     * 商品下载
@@ -168,6 +174,7 @@
                    }

                    if (null == mat) {
                        // 平仓
                        mat = new Mat(
                                String.valueOf(data.getRec()),    // 编号
                                null,    // 所属区域
@@ -193,8 +200,12 @@
                                updateTime,    // 修改时间
                                null    // 备注
                        );

                        matService.insert(mat);
                        // 立库

                    } else {
                        // 平仓
                        mat.setUuid(String.valueOf(data.getRec()));
                        mat.setMatnr(data.getUserCode());
                        mat.setMaktx(data.getFullName());
@@ -203,6 +214,8 @@
                        mat.setBarcode(data.getBarcode());
                        mat.setUnit(data.getUnit3());
                        matService.updateById(mat);
                        // 立库

                    }
                    log.info("====>> 更新物料：{}", data.getUserCode());
                }
@@ -217,7 +230,7 @@
    /**
     * 商品下载
     */
    @Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(cron = "0 */2 * * * ? ")
    public void updateMatExecute(){
        try {
            Map<String, Object> param = new HashMap<>();
@@ -229,7 +242,8 @@
                    .build()
                    .doPost();
            if (!Cools.isEmpty(response)) {
//                log.info(response);
                log.info("商品数据更新：");
                log.info(response);
                Date now = new Date();
                Result result = JSON.parseObject(response, Result.class);
                if (result.getCode() != 1) {
@@ -338,7 +352,11 @@
                                updateTime,    // 修改时间
                                null    // 备注
                        );
                        matService.insert(mat);
                        if (matService.insert(mat)) {
                            MatCode matCode = mat.beMatCode();
                            matCodeMapper.insert(matCode);
                        }

                    } else {
                        mat.setUuid(String.valueOf(data.getRec()));
                        mat.setMatnr(data.getUserCode());
@@ -347,7 +365,10 @@
                        mat.setUpdateTime(updateTime);
                        mat.setBarcode(data.getBarcode());
                        mat.setUnit(data.getUnit3());
                        matService.updateById(mat);
                        if (matService.updateById(mat)) {
                            MatCode matCode = mat.beMatCode();
                            matCodeMapper.updateById(matCode);
                        }
                    }
                    log.info("====>> 更新物料：{}", data.getUserCode());
                }
@@ -425,7 +446,7 @@
    /**
     * 持久化销售订单
     */
    @Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(cron = "0 */1 * * * ?")
    @Transactional
//    @PostConstruct
    public void getOrdersExecute(){
@@ -602,7 +623,17 @@
                            .doPost();

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

                        RequestLog logInfo = new RequestLog();
                        logInfo.setName("单据上传，单据类型" + 11);
                        logInfo.setRequest(JSON.toJSONString(getOrderResult0)); // 入参
                        logInfo.setResponse(response); // 出参
                        logInfo.setCreateTime(new Date());
                        requestLogService.insert(logInfo);

                    } catch (Exception e) {
                        log.error(e.getMessage());
                    }
@@ -610,20 +641,13 @@
                    if (!Cools.isEmpty(response)) {
                        log.warn(response);
                        Result result = JSON.parseObject(response, Result.class);
                        if (result.getCode() != 1) {
                        if (result.getCode() != 1 && !result.getMsg().equals("单据已经审核完成或删除，不能审核。")) {
                            continue;
                        }
                        if (!orderService.updateSettle(order.getOrderNo(), 6L)) {
                            throw new CoolException("修改订单状态失败");
                        }
//                        // 转历史档
//                        int save = custOrderMapper.saveLog(getOrderResult0.getNumber());
//                        if (save > 0) {
//                            if (custOrderMapper.delete(new EntityWrapper<CustOrder>().eq("number", getOrderResult0.getNumber())) == 0) {
//                                throw new CoolException("删除销售订单失败");
//                            }
//                            log.info("{}销售订单拣货结束", getOrderResult0.getNumber());
//                        }

                    }

                }
@@ -702,7 +726,16 @@
                            .doPost();

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

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