#

yxFwq

3 天以前 c643491fffa78a9210abfa7cbdd9e0851648a3d7

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

@@ -17,6 +17,7 @@
import com.zy.common.constant.MesConstant;
import com.zy.common.model.MesPakinParam;
import com.zy.common.model.MesPakoutParam;
import com.zy.common.model.YXErpPakinParam;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,32 +55,31 @@
        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
        // 入库完成上报
        if (docType.getPakin() == 1) {
            MesPakinParam pakinParam = new MesPakinParam();
            pakinParam.setPakinTime(DateUtils.convert(order.getUpdateTime()));
            pakinParam.setLgortFrom("5008");
            pakinParam.setLgortTo("5006");
            YXErpPakinParam pakinParam = new YXErpPakinParam(order.getOrderNo(),order.getMemo());

            for (OrderDetl orderDetl : orderDetls) {
                String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
                pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
//                String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
                pakinParam.getDetail().add(new YXErpPakinParam.Detl(orderDetl,true));
                pakinParam.getDetail().add(new YXErpPakinParam.Detl(orderDetl,false));
            }
            String response = "";
            boolean success = false;
            try {
                response = new HttpHandler.Builder()
                        .setUri(MesConstant.URL)
                        .setPath(MesConstant.PAKIN_URL)
                        .setUri(MesConstant.ERP_URL)
                        .setPath(MesConstant.ERP_BIG_URL)
                        .setJson(JSON.toJSONString(pakinParam))
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getInteger("code").equals(200)) {
                if (jsonObject.getInteger("code").equals(0)) {
                    success = true;
                    // 修改订单状态 4.完成 ===>> 6.已上报
                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
                        throw new CoolException("上报完成更新订单状态异常，请联系管理员");
                    }
                } else {
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.ERP_URL+MesConstant.ERP_BIG_URL, JSON.toJSONString(pakinParam), response);
                    order.setUpdateTime(new Date());
                    orderService.updateById(order);
                    throw new CoolException("上报mes系统失败");
@@ -95,7 +95,7 @@
                    // 保存接口日志
                    apiLogService.save(
                            "胶料入库上报至ERP",
                            MesConstant.URL + MesConstant.PAKIN_URL,
                            MesConstant.ERP_URL + MesConstant.ERP_BIG_URL,
                            null,
                            "127.0.0.1",
                            JSON.toJSONString(pakinParam),
@@ -105,6 +105,7 @@
                } catch (Exception e) { log.error("", e); }
            }
        }
        /*
        // 出库完成上报
        if (docType.getPakout() == 1) {
            MesPakoutParam pakoutParam = new MesPakoutParam();
@@ -159,6 +160,7 @@
                } catch (Exception e) { log.error("", e); }
            }
        }
        */
        return SUCCESS;
    }