完善erp对接

zc

5 天以前 48a341f0b97479b449cbac9f53faf56f08a5c7cc

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

@@ -7,11 +7,9 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlReport;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderDetlReportService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.third.TokenUtils;
@@ -39,16 +37,18 @@
    @Autowired
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private OrderDetlReportService orderDetlReportService;
    @Autowired
    private ApiLogService apiLogService;
    @Autowired
    private DocTypeService docTypeService;

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

    @Value("mes.pakin")
    @Value("${mes.pakin}")
    private String pakin;

    @Transactional
@@ -57,9 +57,10 @@
        if (null == docType) {
            return SUCCESS;
        }
        List<OrderDetlReport> orderDetls = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("orderNo", order.getOrderNo()));
        //List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
        List<OrderDetlReport> orderDetls = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo()));
        // 入库完成上报
        if (docType.getPakin() == 1) {
        if (docType.getPakin() == 1 && !Cools.isEmpty(orderDetls)) {
            MesPakinParam pakinParam = new MesPakinParam();
            pakinParam.setReceiptNumber(order.getOrderNo());
            pakinParam.setReceiptType(order.getDocType$());
@@ -68,7 +69,7 @@
                MesPakinParam.Detl detl = new MesPakinParam.Detl();
                detl.setQty(orderDetl.getAnfme());
                detl.setBarcode(orderDetl.getThreeCode());
                detl.setPalletBarcode(orderDetl.getBarcode());
                detl.setPalletBarcode(orderDetl.getZpallet());
                detl.setProductionCode(orderDetl.getMatnr());
                pakinParam.getBarcodeList().add(detl);
            }
@@ -106,7 +107,7 @@
                    // 保存接口日志
                    apiLogService.save(
                            "成品库入库上报",
                            url +pakin,
                            url + pakin,
                            null,
                            "127.0.0.1",
                            JSON.toJSONString(pakinParam),
@@ -119,7 +120,7 @@
            }
        }
        // 出库完成上报
//        if (docType.getPakout() == 1) {
        if (docType.getPakout() == 1) {
//            MesPakoutParam pakoutParam = new MesPakoutParam();
//            pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("手动出库单"));
//            pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));
@@ -146,9 +147,9 @@
//                if (jsonObject.getInteger("code").equals(200)) {
//                    success = true;
//                    // 修改订单状态 4.完成 ===>> 6.已上报
//                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
//                        throw new CoolException("服务器内部错误，请联系管理员");
//                    }
            if (!orderService.updateSettle(order.getId(), 6L, null)) {
                throw new CoolException("服务器内部错误，请联系管理员");
            }
//                } else {
//                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
//                    throw new CoolException("上报mes系统失败");
@@ -171,7 +172,7 @@
//                    );
//                } catch (Exception e) { log.error("", e); }
//            }
//        }
        }
        return SUCCESS;
    }