完善erp对接

zc

3 天以前 134af8323aab69b405041823dfe6c0593e876c94

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

@@ -69,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);
            }
@@ -120,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()));
@@ -147,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系统失败");
@@ -172,7 +172,7 @@
//                    );
//                } catch (Exception e) { log.error("", e); }
//            }
//        }
        }
        return SUCCESS;
    }