扫码，拆零，无拆零插入备份表

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;
+}

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.dao.collect.IoCollectCodeBackMapper;
-import com.glxp.api.entity.collect.IoCollectOrderCodeAuto;
+import com.glxp.api.entity.collect.*;
-import com.glxp.api.entity.collect.IoCollectOrderCodeMan;
 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<IoCollectCodeMapper, IoCollectCode> {
@@ -41,7 +39,6 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
     IoCollectOrderService collectOrderService;
 
 
-
     /**
      * 追溯码查询
      *
@@ -96,13 +93,15 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
         }
     }
 
+    @Resource
+    IoCollectCodeBackService collectCodeBackService;
 
     public void saveManuCode(List<IoCollectOrderCodeMan> manList, IoCollectOrder collectOrder) {
         if (CollUtil.isEmpty(manList))
             return;
-        List<IoCollectCode> ioCollectCodes = new ArrayList<>();
+        List<IoCollectCodeBackup> 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<IoCollectCodeMapper, IoCol
                     .relId(ioCollectOrderCodeMan.getRelId())
                     .remark(collectOrder.getRemark()).build());
         }
-        saveBatch(ioCollectCodes);
+        collectCodeBackService.saveBatch(ioCollectCodes);
     }
 
     public void saveSplitCode(List<IoCollectOrderCodeAuto> codeAutoList, IoCollectOrder collectOrder) {
         if (CollUtil.isEmpty(codeAutoList))
             return;
-        List<IoCollectCode> ioCollectCodes = new ArrayList<>();
+        List<IoCollectCodeBackup> 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<IoCollectCodeMapper, IoCol
                     .workPlaceCode(collectOrder.getWorkPlaceCode())
                     .remark(collectOrder.getRemark()).build());
         }
-        saveBatch(ioCollectCodes);
+        collectCodeBackService.saveBatch(ioCollectCodes);
     }
 
     public void saveUnSplitCode(List<IoCollectOrderCodeAuto> codeAutoList, IoCollectOrder collectOrder) {
         if (CollUtil.isEmpty(codeAutoList))
             return;
-        List<IoCollectCode> ioCollectCodes = new ArrayList<>();
+        List<IoCollectCodeBackup> 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<IoCollectCodeMapper, IoCol
                     .workPlaceCode(collectOrder.getWorkPlaceCode())
                     .remark(collectOrder.getRemark()).build());
         }
-        saveBatch(ioCollectCodes);
+        collectCodeBackService.saveBatch(ioCollectCodes);
     }
 
 
-
 }

src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java

@@ -841,12 +841,13 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
         //todo 备份码表
 
-        //删除原来单据
+
         IoCollectOrder finalCollectOrder = collectOrder;
         ThreadUtil.execAsync(() -> {
-            removeOrderByBillNo(finalCollectOrder);
             //插入到码表
             collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
+            //删除原来单据
+            removeOrderByBillNo(finalCollectOrder);
             //更新数据至第三方系统
             //单据更新
             ioCollectOrderBackupService.generateOrder(finalCollectOrder.getBillNo(), authAdmin);