agv 根据调试完善MES相关接口功能

zyx

2023-07-26 e2ae6b57bb1398391be2050e85a729a7c8682f1f

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

@@ -13,6 +13,7 @@
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.MesSyncUtil;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,14 +46,14 @@
    @Autowired
    private DocTypeService docTypeService;

    @Value("${mes.pakin-sync.url}")
    private String pakinUrl;
    @Value("${mes.pakin-sync.uri}")
    private String pakinUri;

    @Value("${mes.pakin-sync.path}")
    private String pakinPath;

    @Value("${mes.pakout-sync.url}")
    private String pakoutUrl;
    @Value("${mes.pakout-sync.uri}")
    private String pakoutUri;

    @Value("${mes.pakout-sync.path}")
    private String pakoutPath;
@@ -183,11 +184,12 @@
        boolean success = false;
        try {
            response = new HttpHandler.Builder()
                    .setUri(pakoutUrl)
                    .setUri(pakoutUri)
                    .setPath(pakoutPath)
                    .setParams(MesSyncUtil.getRequestParamMap())
                    .setJson(JSON.toJSONString(requestMap))
                    .build()
                    .doPost();
                    .doPostWithParam();
            success = orderSettleUpdate(response,order);
        } catch (Exception e) {
            log.error("fail", e);
@@ -198,7 +200,7 @@
                // 保存接口日志
                apiLogService.save(
                        "成品库出库上报",
                        pakoutUrl + pakoutPath,
                        pakoutUri + pakoutPath,
                        null,
                        "127.0.0.1",
                        JSON.toJSONString(requestMap),
@@ -213,17 +215,20 @@

    private  ReturnT<String> orderPakinSync (Order order, String orderType, List<OrderDetl> orderDetls){
        Map<String,Object> requestMap = getRequestMap(order,orderType,orderDetls);
        System.out.println("requestMap: " + requestMap);

        String response = "";
        boolean success = false;

        try {
            response = new HttpHandler.Builder()
                    .setUri(pakinUrl)
                    .setUri(pakinUri)
                    .setPath(pakinPath)
                    .setParams(MesSyncUtil.getRequestParamMap())
                    .setJson(JSON.toJSONString(requestMap))
                    .build()
                    .doPost();
                    .doPostWithParam();
            System.out.println(response);
            success = orderSettleUpdate(response,order);
        } catch (Exception e) {
            log.error("fail", e);
@@ -234,7 +239,7 @@
                // 保存接口日志
                apiLogService.save(
                        "成品库入库上报",
                        pakinUrl + pakinPath,
                        pakinUri + pakinPath,
                        null,
                        "127.0.0.1",
                        JSON.toJSONString(requestMap),
@@ -253,6 +258,7 @@
        requestMap.put("orderNo",order.getOrderNo());
        requestMap.put("orderTime",order.getOrderTime());
        requestMap.put("orderType",orderType);
        requestMap.put("storage",order.getShipName());

        List<DiaphragmInfo> diaphragmInfoList = orderDetls.stream().map(od -> {
            DiaphragmInfo diaphragmInfo = new DiaphragmInfo();