Merge remote-tracking branch 'origin/dev_2.5_scan' into dev_2.5_scan

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

@@ -583,18 +583,18 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
                 if (!collectOrder.getTagStatus().equals(4) && (IntUtil.value(collectSet.getAutoDealOrder()) || IntUtil.value(collectOrderRequest.getForceAllot()))) {//没出现耗材不匹配 且 开启了自动转成待处理单据
                     collectOrder.setTagStatus(1);
-                    allotCollects.add(collectOrder);
+                    boolean isExit = collectOrderMapper.exists(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, collectOrder.getBillNo()).eq(IoCollectOrder::getBusType, collectOrder.getBusType()));
-                    allotCollectBizs.addAll(bizList);
+                    if (!isExit) {
+                        collectOrderMapper.insert(collectOrder);
+                        collectOrderBizService.saveBatch(bizList);
+                    }
+//                    saveBatch(allotCollects);
+//                    allotCollects.add(collectOrder);
+//                    allotCollectBizs.addAll(bizList);
                 }
             }
 
-            if (CollUtil.isNotEmpty(allotCollects)) {
-
-                    saveBatch(allotCollects);
-                    collectOrderBizService.saveBatch(allotCollectBizs);
 
-
-            }
         }
     }
 

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

@@ -26,6 +26,7 @@ import com.glxp.api.service.thrsys.SysWorkplacePutRelService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.OrderNoTypeBean;
+import com.glxp.api.util.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -603,7 +604,18 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
             } else if (total > 0) {
                 collectOrderBiz.setAutoTagStatus(3);
             } else collectOrderBiz.setAutoTagStatus(1);
+
+
+            if(CollUtil.isNotEmpty(splitFifoCodeEntities)){
+                IoSplitFifoCodeEntity ioSplitFifoCodeEntity =  splitFifoCodeEntities.get(0);
+                if(ioSplitFifoCodeEntity!=null && StringUtils.isNotEmpty(ioSplitFifoCodeEntity.getBatchNo())){
+                    collectOrderBiz.setBatchNo(ioSplitFifoCodeEntity.getBatchNo());
+                    collectOrderBiz.setProductDate(ioSplitFifoCodeEntity.getProduceDate());
+                    collectOrderBiz.setExpireDate(ioSplitFifoCodeEntity.getExpireDate());
+                }
+            }
         }
+
         ThreadUtil.execAsync(() -> {
             ioCollectLedGroupService.openLed(collectOrderBizs);
         });