#

luxiaotao1123

2021-11-24 b062314f84ccdb27c074cb1e672e0ef56e091c73

 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;
@@ -35,11 +36,12 @@
@RestController
public class ErpScheduler {

    public static final String URI = "http://8.133.182.21:6220/api";
    public static final String URI = "http://123.60.34.127:6220/api";
    public static final String GET_ORDERS = "cM/basis/getOrders";
    public static final String GET_BASIS = "cM/basis/getBasis";
    public static final String UPLOAD_BILL = "cM/basis/uploadBill";
    public static final String UPLOAD_STOCK = "cM/basis/uploadStock";
    public static final String GET_STOCK = "cM/ptype/GetStock";
    public static final String OVER_BILL = "cM/basis/OverBill";
    public static final String UPLOAD_CANCEL_RESULT = "cM/basis/cancelOrders";

@@ -63,6 +65,13 @@
    private PakoutService pakoutService;
    @Autowired
    private NodeService nodeService;
    @Autowired
    private DocLogService docLogService;
    @Autowired
    private RequestLogService requestLogService;
    @Autowired
    private MatCodeMapper matCodeMapper;


    /**
     * 商品下载
@@ -166,6 +175,7 @@
                    }

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

                        matService.insert(mat);
                        // 立库

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

                    }
                    log.info("====>> 更新物料：{}", data.getUserCode());
                }
@@ -215,7 +231,7 @@
    /**
     * 商品下载
     */
    @Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(cron = "0 */2 * * * ? ")
    public void updateMatExecute(){
        try {
            Map<String, Object> param = new HashMap<>();
@@ -227,7 +243,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) {
@@ -336,7 +353,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());
@@ -345,7 +366,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());
                }
@@ -423,7 +447,7 @@
    /**
     * 持久化销售订单
     */
    @Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(cron = "0 */1 * * * ?")
    @Transactional
//    @PostConstruct
    public void getOrdersExecute(){
@@ -544,6 +568,7 @@
//    @PostConstruct
    public void finishOrdersExecute(){
        try {
            Date now = new Date();
            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4).isNotNull("number"));
            if (!Cools.isEmpty(orders)) {
                List<String> orderNos = orders.stream().map(Order::getOrderNo).distinct().collect(Collectors.toList());
@@ -552,6 +577,8 @@
                    List<GetOrderResultDetl0> list = new ArrayList<>();
                    getOrderResult0.setDetail(list);

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

                    // 头
                    getOrderResult0.setNumber(order.getOrderNo());
@@ -573,6 +600,18 @@
                        detl0.setUnit(orderDetl.getUnit());
                        detl0.setRowNo(Integer.parseInt(orderDetl.getName()));
                        list.add(detl0);

                        // 日志
                        docLogs.add(new DocLog(
                                order.getOrderNo(),    // 单据编号
                                11L,    // 单据类型
                                "销售订单",    // 单据名称
                                orderDetl.getMatnr(),    // 商品编号
                                orderDetl.getCount(),    // 上报数量
                                1,    // 结果
                                now,    // 上报时间
                                null    // 备注
                        ));
                    }

                    log.warn(JSON.toJSONString(getOrderResult0));
@@ -583,23 +622,33 @@
                            .setJson(JSON.toJSONString(getOrderResult0))
                            .build()
                            .doPost();

                    try {
                        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());
                    }

                    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());
//                        }

                    }

                }
@@ -621,6 +670,7 @@
//    @PostConstruct
    public void finishOrders0Execute(){
        try {
            Date now = new Date();
            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4).eq("doc_type", 6));
            if (!Cools.isEmpty(orders)) {
                List<String> orderNos = orders.stream().map(Order::getOrderNo).distinct().collect(Collectors.toList());
@@ -629,6 +679,8 @@
                    List<GetOrderResultDetl0> list = new ArrayList<>();
                    getOrderResult0.setDetail(list);

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

                    // 头
                    getOrderResult0.setNumber(order.getOrderNo());
@@ -651,10 +703,21 @@
                        detl0.setUnit(orderDetl.getUnit());
                        detl0.setComment(orderDetl.getMemo());
                        list.add(detl0);

                        // 日志
                        docLogs.add(new DocLog(
                                order.getOrderNo(),    // 单据编号
                                6L,    // 单据类型
                                "采购退货订单",    // 单据名称
                                orderDetl.getMatnr(),    // 商品编号
                                orderDetl.getCount(),    // 上报数量
                                1,    // 结果
                                now,    // 上报时间
                                null    // 备注
                        ));
                    }

                    System.out.println(JSON.toJSONString(getOrderResult0));


                    String response = new HttpHandler.Builder()
                            .setUri(URI)
@@ -662,6 +725,22 @@
                            .setJson(JSON.toJSONString(getOrderResult0))
                            .build()
                            .doPost();

                    try {
                        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());
                    }

                    if (!Cools.isEmpty(response)) {
                        log.warn(response);
                        Result result = JSON.parseObject(response, Result.class);