切换分支，备份

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

@@ -690,8 +690,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         this.lambdaUpdate().set(IoCollectOrder::getUpdateTime, new Date()).set(collectOrderRequest.getUpdateUser() != null, IoCollectOrder::getUpdateUser, collectOrderRequest.getUpdateUser()).set(IoCollectOrder::getOrderTime, new Date()).eq(IoCollectOrder::getId, collectOrderRequest.getId()).update();
     }
 
-    SysWorkplacePutRelService sysWorkplacePutRelService;
-
     @Transactional(rollbackFor = Exception.class)
     public void finishOrder(CollectOrderRequest collectOrderRequest, AuthAdmin authAdmin, Boolean isAuto) {
         IoCollectOrder collectOrder = new IoCollectOrder();

src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java

@@ -211,7 +211,8 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
         //如果手动扫码判断该码是否在队列里，如果已在队列，则队列里剔除
         List<IoCollectOrderCodeMan> collectOrderCodeMEN = collectOrderCodeManService.listByBillNo(collectOrder.getBillNo());
         if (CollUtil.isNotEmpty(collectOrderCodeMEN)) {
-//            dealOrderReplace(collectOrderCodeMEN, collectOrder);
+            //扫码冲突
+//            dealOrderReplace(collectOrderCodeMEN, collectOrder,putWorkPlaceCode);
             for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodeMEN) {
                 if (IntUtil.value(collectOrderCodeMan.getRemoveFlag())) {
                     continue;
@@ -370,11 +371,11 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
     /**
      * 手动赋码与自动赋码冲突时解决方案
      */
-    public void dealOrderReplace(List<IoCollectOrderCodeMan> collectOrderCodeManList, IoCollectOrder collectOrder) {
+    public void dealOrderReplace(List<IoCollectOrderCodeMan> collectOrderCodeManList, IoCollectOrder collectOrder,Long putWorkPlaceCode) {
         for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodeManList) {
             // 1. 查找已完成成单据扫码是否已被分配
 
-            List<IoCollectCodeBackup> collectCodeBackups = collectCodeBackMapper.selectList(new LambdaQueryWrapper<IoCollectCodeBackup>().eq(IoCollectCodeBackup::getBusType, collectOrder.getBusType()).eq(IoCollectCodeBackup::getCode, collectOrderCodeMan.getUdiCode()));
+            List<IoCollectCodeBackup> collectCodeBackups = collectCodeBackMapper.selectList(new LambdaQueryWrapper<IoCollectCodeBackup>().eq(IoCollectCodeBackup::getBusType, collectOrder.getBusType()).eq(IoCollectCodeBackup::getCode, collectOrderCodeMan.getUdiCode()).eq(IoCollectCodeBackup::getIsSplitCode, 0));
             if (CollUtil.isNotEmpty(collectCodeBackups)) {
                 IoCollectCodeBackup collectCodeBackup = collectCodeBackups.get(0);
 
@@ -386,7 +387,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                 collectOrderCodeMan.setRemoveFlag(true);
                 // 单据已被上传至医保
                 if (IntUtil.value(collectOrderBackup.getUploadStatus()) == 2) {
-                    IoSplitFifoCodeEntity splitFifoCodeEntity = removeInvByCode(collectOrderCodeMan, collectOrder.getWorkPlaceCode());
+                    IoSplitFifoCodeEntity splitFifoCodeEntity = removeInvByCode(collectOrderCodeMan, putWorkPlaceCode);
                     if (splitFifoCodeEntity == null) {
                         throw new JsonException(500, "工位存量不足！");
                     }
@@ -398,7 +399,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
 
                 } else {
                     //单据未上传医保，上传医保失败
-                    IoSplitFifoCodeEntity splitFifoCodeEntity = removeInvByCode(collectOrderCodeMan, collectOrder.getWorkPlaceCode());
+                    IoSplitFifoCodeEntity splitFifoCodeEntity = removeInvByCode(collectOrderCodeMan, putWorkPlaceCode);
                     if (splitFifoCodeEntity == null) {
                         throw new JsonException(500, "工位存量不足！");
                     }