Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

17 小时以前 9279bad9ac573542041e3a3e0664b207d3c398b4

 src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java

@@ -37,17 +37,17 @@

import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;

@Slf4j
@Service("kopenApiServiceImpl")
public class KopenApiServiceImpl implements KopenApiService {

@@ -65,6 +65,13 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private CheckOrderDetlService checkOrderDetlService;
    @Value("${kopen.url}")
    private String url;
    @Value("${kopen.port}")
    private String port;
    @Value("${kopen.prefix}")
    private String prefix;


    /**
     * 接收下发订单信息
@@ -101,8 +108,8 @@
        String response = null;
        try {
            response = new HttpHandler.Builder()
                    .setUri("127.0.0.1:8081")
                    .setPath("/wms/order/getInDispatchResult")
                    .setUri(url + ":" + port)
                    .setPath(prefix + "/getInDispatchResult")
                    .setJson(JSONObject.toJSONString(params))
                    .build()
                    .doPost();
@@ -118,8 +125,29 @@
                return XSR.error(Objects.isNull(msg) ? "上报失败！！" : msg);
            }
        } catch (Exception e) {
            log.error(e.getMessage(), e);
            return XSR.error(e.getMessage());
        }
    }

    /**
     * 获取自定义请求头
     * @author Ryan
     * @date 2025/12/29 9:11
     * @return java.util.Map<java.lang.String,java.lang.Object>
     */
    private Map<String, Object> getHeaderParam() {
        Map<String, Object> headerParam = new HashMap<>();
//        headerParam.put("accept", "*/*");
//        headerParam.put("connection", "Keep-Alive");
        //设置请求连接的Token
        headerParam.put("api_key", "WMS");
        headerParam.put("charset", "UTF-8");
        headerParam.put("timestamp", new Date());
        headerParam.put("format", "xml");
        headerParam.put("signature", "c56ced444ed772098ffeb59537bbfa59");

        return headerParam;
    }

    /* */
@@ -296,7 +324,11 @@
                // 备货指示派工单（EO/SO）出库
                order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",
                        orderParams.getDispatch_no()));
            } else {
                throw new CoolException("单据类型不存在，不支持添加！！");
            }
        } else {
            throw new CoolException("单据类型不存在，不支持添加！！");
        }
        // 出库
        if (type.equals("add") && !Objects.isNull(order)) {
@@ -591,4 +623,8 @@
        });
    }

    private String kopen() {
        return url + ":" + port + prefix;
    }

}