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

zhangc

2024-12-25 aa3476e8ff45d168f0bb9376ed3a114610a65f12

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

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

import cn.hutool.core.util.NumberUtil;
import com.alibaba.excel.util.NumberUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
@@ -29,6 +28,7 @@
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;

/**
 * Created by vincent on 2020/7/7
@@ -48,6 +48,9 @@

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

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

    @Value("${u8.url}")
    private String url;
@@ -83,9 +86,13 @@
    }

    @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())) {
@@ -99,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);
@@ -106,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);
                    }
                }
@@ -127,13 +141,14 @@
        }
        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) {
@@ -186,7 +201,7 @@
        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"))) {