diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index cfcf93a1b..424e804c2 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -583,18 +583,18 @@ public class IoCollectOrderService extends ServiceImpl().eq(IoCollectOrder::getBillNo, collectOrder.getBillNo()).eq(IoCollectOrder::getBusType, collectOrder.getBusType())); + 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); - - } } } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index be562f655..93f392fff 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/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 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); });