diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/DsxyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/DsxyyClient.java index 66f6ec4..a84c32a 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/DsxyyClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/DsxyyClient.java @@ -8,18 +8,15 @@ import com.alibaba.fastjson.TypeReference; import com.glxp.mipsdl.admin.config.ThirdSysConfig; import com.glxp.mipsdl.admin.constant.ConstantStatus; import com.glxp.mipsdl.admin.constant.ConstantType; -import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysBusApiDao; -import com.glxp.mipsdl.admin.dao.basic.BussinessLocalTypeDao; -import com.glxp.mipsdl.admin.dao.basic.BussinessTypeDao; -import com.glxp.mipsdl.admin.dao.basic.UdiRelevanceDao; +import com.glxp.mipsdl.admin.dao.basic.*; import com.glxp.mipsdl.admin.dao.business.StockOrderDao; import com.glxp.mipsdl.admin.dao.business.StockOrderDetailDao; import com.glxp.mipsdl.admin.dao.inout.CodesDao; import com.glxp.mipsdl.admin.dao.inout.OrderDao; import com.glxp.mipsdl.admin.dao.inventory.InvWarehouseDao; -import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysDetailDao; import com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao; import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity; import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity; @@ -28,7 +25,6 @@ import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity; import com.glxp.mipsdl.admin.entity.inout.OrderEntity; import com.glxp.mipsdl.admin.entity.inout.WarehouseEntity; import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrCorpEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrProductsEntity; @@ -39,9 +35,9 @@ import com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest; import com.glxp.mipsdl.admin.req.dsxyy.*; import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest; import com.glxp.mipsdl.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.mipsdl.admin.service.StockOrderUploadLogService; import com.glxp.mipsdl.admin.service.basic.BasicThirdSysBusApiService; import com.glxp.mipsdl.admin.service.basic.BussinessOriginTypeService; -import com.glxp.mipsdl.admin.service.StockOrderUploadLogService; import com.glxp.mipsdl.admin.util.DateUtil; import com.glxp.mipsdl.admin.util.HttpClient; import com.glxp.mipsdl.admin.util.SubmitOrderUtils; @@ -341,7 +337,16 @@ public class DsxyyClient { BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("orderSubmitUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); //记录日志 + //提交到东山县医院结算系统 + /*ThreadUtil.execAsync(() -> { + StockOrderUploadLogEntity logEntity = new StockOrderUploadLogEntity(); + BeanUtil.copyProperties(uploadLog, logEntity); + submitToSettlementSys(logEntity, udiwmsOrderRequest); + });*/ + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsOrderRequest, getHeaderArray()); + + //submitTo if (StrUtil.isNotBlank(response)) { try { BaseResponse baseResponse = @@ -377,6 +382,43 @@ public class DsxyyClient { } } + /** + * 提交到东山县医院结算系统 + * + * @param udiwmsOrderRequest + */ + private void submitToSettlementSys(StockOrderUploadLogEntity uploadLog, DsOrderRequest udiwmsOrderRequest) { + log.info("提交单据到东山县医院结算系统"); + uploadLog.setSubmitTime(new Date()); + //TODO 待东山结算系统单据提交接口提供之后补全代码 + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + "", udiwmsOrderRequest, getHeaderArray()); + if (StrUtil.isNotBlank(response)) { + try { + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + if (baseResponse.getCode().equals(20000)) { + uploadLog.setStatus(2); + uploadLog.setThrBillNo(null); + uploadLog.setResult("提交成功"); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + } + uploadLog.setStatus(3); + uploadLog.setResult("提交失败,错误信息:" + baseResponse.getMessage()); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + } catch (Exception e) { + log.error(e.getMessage(), e); + uploadLog.setStatus(3); + uploadLog.setResult("提交失败,错误信息:" + e.getMessage()); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + } + } else { + uploadLog.setStatus(3); + uploadLog.setResult("提交失败,调用接口返回为空"); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + } + } + public List transferSerList(List stockOrderDetailEntities, String orderId) { List resultList = new ArrayList<>(); diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YxzyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YxzyyClient.java index a643ba6..f841376 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YxzyyClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YxzyyClient.java @@ -312,6 +312,9 @@ public class YxzyyClient { item.setMeasname(udiRelevanceEntity.getMeasname()); item.setStandard(stockOrderDetailEntity.getSpec()); item.setRegisterNo(stockOrderDetailEntity.getZczbhhzbapzbh()); + + item.setProductDate(StrUtil.isBlank(stockOrderDetailEntity.getProductDate()) ? null : "20" + stockOrderDetailEntity.getProductDate()); + item.setExpireDate(StrUtil.isBlank(stockOrderDetailEntity.getExpireDate()) ? null : "20" + stockOrderDetailEntity.getExpireDate()); try { item.setPrice(stockOrderDetailEntity.getPrice() + ""); item.setFirstSalesInvNo(stockOrderDetailEntity.getFirstSalesInvNo());