From 22dda55b20ffd0181e916a451f380b0e69b6a372 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Tue, 11 Mar 2025 20:57:39 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93?= =?UTF-8?q?=20=E5=8C=BB=E4=BF=9D=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IoCollectOrderBackupController.java | 69 +++++++++++++------ .../dao/basic/SysWorkplaceDocumentDao.java | 3 + .../entity/collect/IoCollectCodeBackup.java | 2 + .../com/glxp/api/http/ErpBasicClient.java | 27 ++++++++ .../PostOrderMedicalDeleteRequest.java | 17 +++++ .../res/collect/CollectOrderBizResponse.java | 1 + .../basic/SysWorkplaceDocumentService.java | 13 ++++ .../collect/IoCollectOrderBackupService.java | 32 ++++++++- .../mapper/basic/SysWorkplaceDocumentDao.xml | 29 ++++++++ 9 files changed, 172 insertions(+), 21 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/collect/PostOrderMedicalDeleteRequest.java diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java index d4b650f9e..283f1c903 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java @@ -6,12 +6,12 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; +import com.glxp.api.dao.collect.IoCollectOrderBackupMapper; import com.glxp.api.entity.collect.IoCollectOrderBackup; import com.glxp.api.entity.collect.IoCollectOrderCodeMan; +import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.basic.BasicCollectUserRequest; -import com.glxp.api.req.collect.CollectOrderBizRequest; -import com.glxp.api.req.collect.CollectOrderRequest; -import com.glxp.api.req.collect.CollectOrderUploadCountRequest; +import com.glxp.api.req.collect.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UserWorkResponse; import com.glxp.api.res.collect.CollectOrderBizResponse; @@ -20,6 +20,7 @@ import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.service.basic.BasicCollectUserService; import com.glxp.api.service.collect.IoCollectOrderBackupService; import com.glxp.api.service.collect.IoCollectOrderBizBackupService; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -36,6 +37,7 @@ import java.util.stream.Collectors; * @modyified By : */ @RestController +@Slf4j public class IoCollectOrderBackupController extends BaseController { @Resource @@ -48,22 +50,23 @@ public class IoCollectOrderBackupController extends BaseController { @PostMapping("/udiwms/basic/collect/orderFinish/filter") public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) { - List workPlaceCodes = null; - List page; - if (collectOrderRequest.getWorkPlaceCode() == null) { - Long userId = getUserId(); - BasicCollectUserRequest request = new BasicCollectUserRequest(); - request.setPage(1); - request.setLimit(100); - request.setUserId(userId.toString()); - page = basicCollectUserService.filterList(request); - if (page != null) { - workPlaceCodes = page.stream() - .map(UserWorkResponse::getWorkplaceId) - .collect(Collectors.toList()); - } - collectOrderRequest.setWorkPlaceCodes(workPlaceCodes); - } +// List workPlaceCodes = null; +// List page; +// if (collectOrderRequest.getWorkPlaceCode() == null) { +// Long userId = getUserId(); +// BasicCollectUserRequest request = new BasicCollectUserRequest(); +// request.setPage(1); +// request.setLimit(100); +// request.setUserId(userId.toString()); +// page = basicCollectUserService.filterList(request); +// if (page != null) { +// workPlaceCodes = page.stream() +// .map(UserWorkResponse::getWorkplaceId) +// .collect(Collectors.toList()); +// } +// collectOrderRequest.setWorkPlaceCodes(workPlaceCodes); +// } + log.error("collectOrderRequest"+collectOrderRequest); List orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest); PageInfo pageInfo = new PageInfo<>(orderResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -111,13 +114,39 @@ public class IoCollectOrderBackupController extends BaseController { if (StrUtil.isEmpty(collectOrderRequest.getBillNo())) return ResultVOUtils.error(500, "单据号不能为空"); Boolean aBoolean = ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(), getUser()); + if (!aBoolean) { return ResultVOUtils.error("上传失败"); } return ResultVOUtils.success(); } + @Resource + private ErpBasicClient erpBasicClient; + /** + * 医保单据删除 + * + * @param collectOrderRequest + * @return + */ + @Resource + private IoCollectOrderBackupMapper ioCollectOrderBackupMapper; + @PostMapping("/udiwms/basic/collect/order/orderMedicalDelete") + public BaseResponse orderMedicalDelete(@RequestBody CollectOrderRequest collectOrderRequest) { + PostOrderMedicalDeleteRequest postOrderMedicalDeleteRequest = new PostOrderMedicalDeleteRequest(); + postOrderMedicalDeleteRequest.setThirdSys("thirdId"); + postOrderMedicalDeleteRequest.setBillNo(collectOrderRequest.getBillNo()); + postOrderMedicalDeleteRequest.setBusType(collectOrderRequest.getBusType()); + BaseResponse baseResponse = erpBasicClient.orderMedicalDelete(postOrderMedicalDeleteRequest); + if (baseResponse.getCode() == 20000) { + IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup(); + ioCollectOrderBackup.setUploadStatus(4); + ioCollectOrderBackupMapper.update( + ioCollectOrderBackup,new QueryWrapper().eq("billNo",collectOrderRequest.getBillNo()) + ); + } - + return baseResponse; + } /** * 通过业务外键获取码明细 * diff --git a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceDocumentDao.java b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceDocumentDao.java index 85b808db3..7f09f9d13 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceDocumentDao.java +++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceDocumentDao.java @@ -22,6 +22,9 @@ public interface SysWorkplaceDocumentDao extends BaseMapperPlus filterListByWorkplace(WorkBindBusTypeRequest request); Integer findMaxNumberByWorkplaceCode(Long workplaceCode); + + List filterListExhibitGoods(WorkBindBusTypeRequest request); + } diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectCodeBackup.java b/src/main/java/com/glxp/api/entity/collect/IoCollectCodeBackup.java index 61694e0c6..a268f8784 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectCodeBackup.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectCodeBackup.java @@ -176,5 +176,7 @@ public class IoCollectCodeBackup implements Serializable { @ApiModelProperty(value = "关联关系数量") private Integer relCodeCount; + @TableField(exist = false) + private String invDataType; private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index 5b10503ed..4a99848f8 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -16,6 +16,7 @@ import com.glxp.api.http.req.UdiwmsBusTypeRequest; import com.glxp.api.http.req.UdiwmsUnitRequest; import com.glxp.api.req.basic.*; import com.glxp.api.req.collect.PostCollectOrderRequest; +import com.glxp.api.req.collect.PostOrderMedicalDeleteRequest; import com.glxp.api.req.drugMachine.PutGoodsA001Request; import com.glxp.api.req.thrsys.*; import com.glxp.api.res.PageSimpleResponse; @@ -297,6 +298,32 @@ public class ErpBasicClient { return ResultVOUtils.error(500, "连接第三方系统接口服务出错" + e.getMessage()); } } + /** + * 删除医保单据 + * + * @param postOrderMedicalDeleteRequest + * @return + */ + public BaseResponse orderMedicalDelete(PostOrderMedicalDeleteRequest postOrderMedicalDeleteRequest) { + ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(postOrderMedicalDeleteRequest.getThirdSys()); + String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/orderMedicalDelete"; + String response = null; + try { + response = HttpUtil.post(url, JSONUtil.toJsonStr(postOrderMedicalDeleteRequest)); +// response = httpOkClient.uCloudPost(url, postOrderRequest); + if (StrUtil.isEmpty(response)) { + return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); + } + // 判断不是 + + return JSONUtil.toBean(response, BaseResponse.class); + } catch (Exception e) { + log.error("获取医保单据信息原来数据===" + response); + + log.error("获取医保单据信息", e); + return ResultVOUtils.error(500, "连接第三方系统接口服务出错" + e.getMessage()); + } + } /** diff --git a/src/main/java/com/glxp/api/req/collect/PostOrderMedicalDeleteRequest.java b/src/main/java/com/glxp/api/req/collect/PostOrderMedicalDeleteRequest.java new file mode 100644 index 000000000..e7a09f7df --- /dev/null +++ b/src/main/java/com/glxp/api/req/collect/PostOrderMedicalDeleteRequest.java @@ -0,0 +1,17 @@ +package com.glxp.api.req.collect; + +import com.glxp.api.entity.collect.IoCollectOrderBackup; +import lombok.Data; + +import java.util.List; + +@Data +public class PostOrderMedicalDeleteRequest { + + + private String thirdSys; + private String billNo; + private String busType; + + +} diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index 1ee36690f..bdd0670d7 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -201,6 +201,7 @@ public class CollectOrderBizResponse { private String measname; + private String invDataType; diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java index 9f5d2e0d9..b0ee17d80 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java @@ -77,7 +77,20 @@ public class SysWorkplaceDocumentService extends ServiceImpl sysWorkplaceDocumentResponses = sysWorkplaceDocumentDao.filterListExhibitGoods(request); + if (CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)) { + SysWorkplaceDocumentResponse sysWorkplaceDocumentResponse = sysWorkplaceDocumentResponses.get(0); + SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = new SysWorkplaceDocumentEntity(); + BeanUtils.copyProperties(sysWorkplaceDocumentResponse, sysWorkplaceDocumentEntity); + return sysWorkplaceDocumentEntity; + } else + return null; + } public boolean addBusType(SysWorkplaceDocumentEntity entity, Long userId) { entity.setId(IdUtil.getSnowflakeNextId()); entity.setCreateTime(new Date()); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index 396fa50b7..ca29bcdaf 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; @@ -176,10 +177,19 @@ public class IoCollectOrderBackupService extends ServiceImpl() + .eq("billNo",collectOrderBizResponse.getBillNo()) + .eq("fifoSplit","1").or().eq("fifoSplit","4") + .last("limit 1") + ); + if(count >0){ + collectOrderBizResponse.setInvDataType("1"); + }else { + collectOrderBizResponse.setInvDataType("0"); + + } + } + if (StrUtil.isNotEmpty(paramValue) && paramValue.equals("0")) { List codeList = new ArrayList<>(); for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponses) { @@ -446,7 +474,7 @@ public class IoCollectOrderBackupService extends ServiceImpl { @@ -523,6 +551,8 @@ public class IoCollectOrderBackupService extends ServiceImpl +