From 4a7858a73d01ad361a91966da63cc9675144ef86 Mon Sep 17 00:00:00 2001 From: yewj Date: Fri, 6 Dec 2024 09:20:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=EF=BC=8C=E6=8B=86=E9=9B=B6?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=8B=86=E9=9B=B6=E6=8F=92=E5=85=A5=E5=A4=87?= =?UTF-8?q?=E4=BB=BD=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/PurOrderReceiveController.java | 2 +- .../api/res/inout/AddEnterCodeResponse.java | 23 +++++++++++++++ .../service/collect/IoCollectCodeService.java | 28 +++++++++---------- .../collect/IoCollectOrderService.java | 5 ++-- 4 files changed, 40 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/glxp/api/res/inout/AddEnterCodeResponse.java diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index 6eec258f7..f2dd88281 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -177,7 +177,7 @@ public class PurOrderReceiveController extends BaseController { // if (filterReceiveRequest.getIsUser() != null && filterReceiveRequest.getIsUser()) { // AuthAdmin authAdmin = customerService.getUserBean(); -// filterReceiveRequest.setCreateUser(authAdmin.getId() + ""); //查询自己 +// filterReceiveRequest.setCreateUser(authAdmin.getId() + ""); //查询自己 // } if (filterReceiveRequest.getIsInvCode() != null && filterReceiveRequest.getIsInvCode()) { AuthAdmin authAdmin = customerService.getUserBean(); diff --git a/src/main/java/com/glxp/api/res/inout/AddEnterCodeResponse.java b/src/main/java/com/glxp/api/res/inout/AddEnterCodeResponse.java new file mode 100644 index 000000000..e32dd6995 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/AddEnterCodeResponse.java @@ -0,0 +1,23 @@ +package com.glxp.api.res.inout; + +import lombok.Data; + +/** + * @author AnthonyYwj + * @date 2024/12/6 + */ +@Data +public class AddEnterCodeResponse { + + private String code; + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private String udi; + + private Integer productType; + + private String cpmctymc; + private String bzgg; +} diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java index e4c271f38..656d1ac95 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java @@ -4,9 +4,8 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageHelper; -import com.glxp.api.entity.collect.IoCollectOrder; -import com.glxp.api.entity.collect.IoCollectOrderCodeAuto; -import com.glxp.api.entity.collect.IoCollectOrderCodeMan; +import com.glxp.api.dao.collect.IoCollectCodeBackMapper; +import com.glxp.api.entity.collect.*; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.IoCollectCodeRequest; import com.glxp.api.res.collect.CollectOrderBizResponse; @@ -23,7 +22,6 @@ import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.collect.IoCollectCodeMapper; -import com.glxp.api.entity.collect.IoCollectCode; @Service public class IoCollectCodeService extends ServiceImpl { @@ -41,7 +39,6 @@ public class IoCollectCodeService extends ServiceImpl manList, IoCollectOrder collectOrder) { if (CollUtil.isEmpty(manList)) return; - List ioCollectCodes = new ArrayList<>(); + List ioCollectCodes = new ArrayList<>(); for (IoCollectOrderCodeMan ioCollectOrderCodeMan : manList) { - ioCollectCodes.add(IoCollectCode.builder().code(ioCollectOrderCodeMan.getUdiCode()) + ioCollectCodes.add(IoCollectCodeBackup.builder().code(ioCollectOrderCodeMan.getUdiCode()) .fromType(collectOrder.getFromType()) .busType(collectOrder.getBusType()) .billNo(collectOrder.getBillNo()) @@ -114,15 +113,15 @@ public class IoCollectCodeService extends ServiceImpl codeAutoList, IoCollectOrder collectOrder) { if (CollUtil.isEmpty(codeAutoList)) return; - List ioCollectCodes = new ArrayList<>(); + List ioCollectCodes = new ArrayList<>(); for (IoCollectOrderCodeAuto collectOrderCodeAuto : codeAutoList) { - ioCollectCodes.add(IoCollectCode.builder().code(collectOrderCodeAuto.getUdiCode()) + ioCollectCodes.add(IoCollectCodeBackup.builder().code(collectOrderCodeAuto.getUdiCode()) .fromType(collectOrder.getFromType()) .busType(collectOrder.getBusType()) .billNo(collectOrder.getBillNo()) @@ -134,15 +133,15 @@ public class IoCollectCodeService extends ServiceImpl codeAutoList, IoCollectOrder collectOrder) { if (CollUtil.isEmpty(codeAutoList)) return; - List ioCollectCodes = new ArrayList<>(); + List ioCollectCodes = new ArrayList<>(); for (IoCollectOrderCodeAuto collectOrderCodeAuto : codeAutoList) { - ioCollectCodes.add(IoCollectCode.builder().code(collectOrderCodeAuto.getUdiCode()) + ioCollectCodes.add(IoCollectCodeBackup.builder().code(collectOrderCodeAuto.getUdiCode()) .fromType(collectOrder.getFromType()) .busType(collectOrder.getBusType()) .billNo(collectOrder.getBillNo()) @@ -154,9 +153,8 @@ public class IoCollectCodeService extends ServiceImpl { - removeOrderByBillNo(finalCollectOrder); //插入到码表 collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo()); + //删除原来单据 + removeOrderByBillNo(finalCollectOrder); //更新数据至第三方系统 //单据更新 ioCollectOrderBackupService.generateOrder(finalCollectOrder.getBillNo(), authAdmin);