From 9341f2bdf0130014a2ddc6993a640011b0327271 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 26 Nov 2024 15:47:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoCodeTempController.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 2b96672ee..3be7c342b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -9,10 +9,7 @@ import com.glxp.api.annotation.CusRedissonAnnotation; import com.glxp.api.constant.*; import com.glxp.api.dao.inout.IoOrderDetailCodeDao; import com.glxp.api.entity.basic.*; -import com.glxp.api.entity.collect.IoCollectCode; -import com.glxp.api.entity.collect.IoCollectOrder; -import com.glxp.api.entity.collect.IoCollectOrderOrigin; -import com.glxp.api.entity.collect.RelCodeDetail; +import com.glxp.api.entity.collect.*; import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderRequest; @@ -114,6 +111,10 @@ public class IoCodeTempController extends BaseController { @Resource IoCollectOriginService collectOriginService; @Resource + IoCollectOrderBizOriginService collectOrderBizOriginService; + @Resource + IoCollectOrderOriginService collectOrderOriginService; + @Resource IoCollectOrderService collectOrderService; @Resource IoCollectCodeService ioCollectCodeService; @@ -172,9 +173,9 @@ public class IoCodeTempController extends BaseController { //查询原始单据查到为异常提示 IoCollectOrderOrigin ioCollectOrigin = collectOriginService.getOrderByCode(code); if (ioCollectOrigin != null) { - BaseResponse response = ResultVOUtils.error(501, "单据已下载,业务不匹配"); - response.setData(code); - return response; + //进行删除 重新匹配 + collectOrderOriginService.remove(new LambdaQueryWrapper().eq(IoCollectOrderOrigin::getBillNo, ioCollectOrigin.getBillNo())); + collectOrderBizOriginService.remove(new LambdaQueryWrapper().eq(IoCollectOrderBizOrigin::getOrderIdFk, ioCollectOrigin.getBillNo())); } //=============================================// //本地数据库 无此单据时 触发 用billNo 到 处方下载方法 进行下载