From b95691bf8be20659097f959b34ac24bbb00ec58a Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 26 Dec 2023 14:53:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=8F=E5=AE=89=EF=BC=8C=E9=95=BF=E6=B3=B0?= =?UTF-8?q?=EF=BC=8C=E9=AB=98=E5=80=BC=E4=B8=8E=E6=99=AE=E9=80=9A=E8=80=97?= =?UTF-8?q?=E6=9D=90=E4=BC=A0=E5=8D=95=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 34 +++++++++++-------- .../glxp/mipsdl/client/zaxyy/ZaxyyClient.java | 15 ++++---- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index de41cc7..6fe9fee 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -453,9 +453,6 @@ public class CtqyyClient extends CommonHttpClient { zaxzyyOrderRequest.setBillDate(DateUtil.formatDateTime(orderEntity.getCreateTime())); //查询对应的第三方单据类型 ThrSystemBusApiEntity thrSystemBusApiEntity = thrSystemBusApiDao.selectOne(new QueryWrapper().eq("code", udiwmsOrderRequest.getBillType())); - if (StrUtil.isBlank(thrSystemBusApiEntity.getUrl())) { -// return ResultVOUtils.error(500, "接口未配置，无法提交！"); - } zaxzyyOrderRequest.setThirdSys(getUserName(orderEntity)); zaxzyyOrderRequest.setBillType(thrSystemBusApiEntity.getThirdBuyCode()); zaxzyyOrderRequest.setBillFlag("1"); @@ -569,25 +566,34 @@ public class CtqyyClient extends CommonHttpClient { //提交到第三方系统 if (thrSystemBusApiEntity.getUrl().equals("saveMasterialInput")) { - //采购入库单据 +// //采购入库单据 +// if (vailHightMaterial(detailBizEntities.get(0))) { +// zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight")); +// UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(zaxzyyOrderRequest, orderEntity); +// zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest)); +// } else { +// zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput")); +// zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest)); +// } + zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput")); + zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest)); + return submitOrder(orderEntity, zaZyRequest); + } else if (thrSystemBusApiEntity.getUrl().equals("saveMaterialHight")) { - if (vailHightMaterial(detailBizEntities.get(0))) { - zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight")); - UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(zaxzyyOrderRequest, orderEntity); - zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest)); - } else { - zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput")); - zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest)); - } + // 1.先提交到物资 + zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput")); + zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest)); + submitOrder(orderEntity, zaZyRequest); - } else if (thrSystemBusApiEntity.getUrl().equals("saveMaterialHight")) { + //2.提交到预备货 zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight")); UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(zaxzyyOrderRequest, orderEntity); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest)); + return submitOrder(orderEntity, zaZyRequest); } - return submitOrder(orderEntity, zaZyRequest); + return ResultVOUtils.error(500, "提交失败！"); } diff --git a/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java b/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java index a37cb48..98bc1fe 100644 --- a/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java @@ -367,21 +367,22 @@ public class ZaxyyClient extends CommonHttpClient { if (thrSystemBusApiEntity.getUrl().equals("saveMasterialInput")) { //采购入库单据 zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput")); - String key = "orderSubmitUrl"; zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest)); + return submitOrder(orderEntity, zaZyRequest); } else if (thrSystemBusApiEntity.getUrl().equals("saveMaterialHight")) { +// 1.先提交到物资； + zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput")); + zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest)); + submitOrder(orderEntity, zaZyRequest); +// 2.提交到预备货 zaxzyyOrderRequest.setLocStorageCode("1001304"); zaxzyyOrderRequest.setLocStorageName("骨科耗材及试剂仓库"); - //临床出库 zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight")); - String key = "preInOrderSubmit"; - UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(zaxzyyOrderRequest, orderEntity); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest)); + return submitOrder(orderEntity, zaZyRequest); } - - return submitOrder(orderEntity, zaZyRequest); - + return ResultVOUtils.error(500, "提交失败！"); } public String getUserName(IoOrderEntity orderEntity) {