添加工厂判断逻辑及优化库位查找

zhangc

2024-12-25 aa3476e8ff45d168f0bb9376ed3a114610a65f12

 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -1,5 +1,6 @@
package com.zy.asrs.task.handler;

import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
@@ -22,10 +23,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;

/**
 * Created by vincent on 2020/7/7
@@ -43,6 +46,12 @@
    @Autowired
    private DocTypeService docTypeService;

    @Value("${spring.profiles.active}")
    private String active;

    @Value("${u8.report}")
    private Boolean report;

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

@@ -51,48 +60,39 @@

    @Transactional
    public ReturnT<String> start(Order order) {
        //List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单", "银座委外材料出库单", "银座委外入库单", "银座生产材料出库单"));
        List<String> docNames = new ArrayList<>(Arrays.asList("银座委外入库单", "银座生产材料出库单"));
        List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单", "银座委外材料出库单", "银座生产材料出库单"));

        DocType docType = docTypeService.selectById(order.getDocType());
        if (!docNames.contains(docType.getDocName())) {
            order.setSettle(8L);
            orderService.updateById(order);
            return SUCCESS;
        }
//        if("手动出库单".equals(docType.getDocName())
//                || "手动入库单".equals(docType.getDocName())
//                || "自动补货单".equals(docType.getDocName())
//                || "人工补货单".equals(docType.getDocName())){
//            order.setSettle(8L);
//            orderService.updateById(order);
//            return SUCCESS;
//        }

        List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());

        ReportErpParam param = new ReportErpParam();
        mappingParam(order, param);
        mappingParamChildren(orderDetlList, param);
        if (Cools.isEmpty(order.getPltType())) {
        } else {
            boolean flag = true;
            List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
            List<OrderDetl> report = new ArrayList<>();
            for (OrderDetl orderDetl : orderDetlList) {
                if (orderDetl.getReportQty() == null || orderDetl.getQty() > orderDetl.getReportQty() || orderDetl.getQty() < orderDetl.getAnfme()) {
                    flag = false;
                }
            }
            if (flag) {
                log.info("单据完结,{}", order);
                order.setSettle(6L);
                orderService.updateById(order);
            }
            return SUCCESS;
        }

        int code = doHttpRequest(param, "单据审核", url, orderReportPath, null, "127.0.0.1");
        if (code == 0) {
            log.info("单据审核,{}", order);
            order.setSettle(6L);
            orderService.updateById(order);
        }

        return SUCCESS;
    }


    @Transactional
    public void timelyStart(Order order) {
    public synchronized void timelyStart(Order order) {
        if (!report) {
            return;
        }

        List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单", "银座委外材料出库单", "银座生产材料出库单"));
        List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单"));
        //List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单", "银座委外材料出库单", "银座生产材料出库单"));

        DocType docType = docTypeService.selectById(order.getDocType());
        if (docNames.contains(docType.getDocName())) {
@@ -106,6 +106,9 @@
            if (Cools.isEmpty(order.getPltType())) {
                return;
            }
            if (Cools.isEmpty(order.getInTime())) {
                order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
            }
            if (!Cools.isEmpty(report)) {
                ReportErpParam param = new ReportErpParam();
                mappingParam(order, param);
@@ -113,9 +116,13 @@
                log.info(JSON.toJSONString(param));
                int code = doHttpRequest(param, "单据审核", url, orderReportPath, null, "127.0.0.1");
                if (code == 0) {
                    Date date = new Date();
                    order.setInTime(DateUtils.convert(date, DateUtils.yyyyMMddHHmmsssss_F));
                    orderService.updateById(order);
                    for (OrderDetl orderDetl : report) {
                        log.info("{}单据审核上报了：{}", order.getOrderNo(), orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
                        orderDetl.setReportQty(orderDetl.getQty());
                        orderDetl.setUpdateTime(date);
                        orderDetlService.updateById(orderDetl);
                    }
                }
@@ -125,17 +132,23 @@
    }

    public void mappingParam(Order order, ReportErpParam param) {
        //param.set操作系统号(order.getDefNumber());
        param.set操作系统号("998");
        if (active.equals("prod")) {
            param.set操作系统号(order.getDefNumber());
        } else if (active.equals("dev") || active.equals("loc")) {
            param.set操作系统号("998");
        } else {
            param.set操作系统号(order.getDefNumber());
        }
        param.set操作单据(order.getDocType$());
        param.set操作类型("add");
        param.setDdate(order.getInTime());
        param.setDdate(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F));
        param.setCWhCode(Cools.isEmpty(order.getPltType()) ? "" : order.getPltType() + "");
        param.setCDepCode("YZ");
        param.setCOrderCode(order.getOrderNo());
        param.setCMaker("");
        param.setCHandler("");
        param.setCDefine14(order.getOrderNo() + "_" + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss + "_" + order.getPltType()));
        param.setCDefine14(order.getOrderNo() + "_" + order.getInTime());
        //param.setCDefine14(order.getOrderNo() + "_" + order.getInTime() + "_" + order.getPltType()));
    }

    public void mappingParamChildren(List<OrderDetl> orderDetlList, ReportErpParam param) {
@@ -155,8 +168,11 @@
                if (s.length > 1) {
                    childInfo.setCBatch(s[0]);
                    childInfo.setBFree1(s[1]);
                } else {
                } else if (s.length == 1) {
                    childInfo.setCBatch(s[0]);
                    childInfo.setBFree1("");
                } else {
                    childInfo.setCBatch("");
                    childInfo.setBFree1("");
                }
            }
@@ -166,19 +182,26 @@
            childInfo.setCOrderCode(orderDetl.getOrderNo());
            childInfo.setIvouchrowno(orderDetl.getItemNum());
            childInfo.setDefine22(orderDetl.getThreeCode());

            if (!Cools.isEmpty(orderDetl.getWeight()) && !Cools.isEmpty(orderDetl.getVolume())) {
                BigDecimal mul = NumberUtil.div(childInfo.getIQuantity(), orderDetl.getVolume() + "");
                childInfo.setINum(mul.toString());
            } else {
                childInfo.setINum("1");
            }
            childInfo.setIinvexchrate(Cools.isEmpty(orderDetl.getVolume()) ? "" : orderDetl.getVolume() + "");
            paramChild.add(childInfo);
        }

    }


    private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
    private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String
            ip) {
        String response = "";
        boolean success = false;

        try {
            response = new HttpHandler.Builder().setUri(url).setPath(path).setJson(JSONObject.toJSONString(requestParam)).build().doPost();
            response = new HttpHandler.Builder().setUri(url).setTimeout(30, TimeUnit.SECONDS).setPath(path).setJson(JSONObject.toJSONString(requestParam)).build().doPost();
            JSONObject jsonObject = JSON.parseObject(response);

            if (Cools.isEmpty(jsonObject.get("succeed"))) {