From 13d295c4210ee589b3e524bd157f85c63bca5a3e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 30 四月 2026 13:12:08 +0800
Subject: [PATCH] 1.出库单据转历史档有问题 2.新增单据历史档 3.修复入库完成转明细失败
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 184 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 184 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index d22e201..396dbc6 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,19 +1,198 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.param.ErrorDeviceParam;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.RowLastnoService;
+import com.zy.asrs.utils.LocAliasUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
+ @Override
+ public List<LocMast> asrLocMastNotInDetl1() {
+ return this.baseMapper.asrLocMastNotInDetl1();
+ }
+
+ @Override
+ public List<LocMast> asrLocMastNotInDetl2() {
+ return this.baseMapper.asrLocMastNotInDetl2();
+ }
+
+ @Override
+ public List<LocMast> asrLocMastNotInDetl3() {
+ return this.baseMapper.asrLocMastNotInDetl3();
+ }
+
+ @Override
+ public List<ErrorDeviceParam> adjacentLocMast() {
+ return this.baseMapper.adjacentLocMast();
+ }
+
+ @Override
+ public void prepareAreaAlias(LocMast locMast) {
+ if (locMast == null) {
+ return;
+ }
+ Integer areaId = locMast.getAreaId();
+ if (areaId == null) {
+ areaId = LocAliasUtils.areaIdByCrnNo(locMast.getCrnNo());
+ locMast.setAreaId(areaId);
+ }
+ Integer minRow = minRowByArea(areaId, locMast.getRow1());
+ locMast.setLocAlias(LocAliasUtils.buildAlias(
+ areaId,
+ locMast.getRow1(),
+ locMast.getBay1(),
+ locMast.getLev1(),
+ minRow));
+ }
+
+ @Override
+ public void fillAreaAlias(List<LocMast> locMasts) {
+ if (Cools.isEmpty(locMasts)) {
+ return;
+ }
+ Map<Integer, Integer> minRowByArea = new HashMap<>();
+ for (LocMast locMast : locMasts) {
+ if (locMast.getAreaId() == null) {
+ locMast.setAreaId(LocAliasUtils.areaIdByCrnNo(locMast.getCrnNo()));
+ }
+ Integer areaId = locMast.getAreaId();
+ Integer row = locMast.getRow1();
+ if (areaId == null || row == null) {
+ continue;
+ }
+ Integer minRow = minRowByArea.get(areaId);
+ if (minRow == null || row < minRow) {
+ minRowByArea.put(areaId, row);
+ }
+ }
+ for (LocMast locMast : locMasts) {
+ locMast.setLocAlias(LocAliasUtils.buildAlias(
+ locMast.getAreaId(),
+ locMast.getRow1(),
+ locMast.getBay1(),
+ locMast.getLev1(),
+ minRowByArea.get(locMast.getAreaId())));
+ }
+ }
+
+ @Override
+ public void batchUpdateArea(List<String> locNos, Integer areaId, Long userId) {
+ if (Cools.isEmpty(locNos)) {
+ throw new CoolException("璇烽�夋嫨搴撲綅");
+ }
+ if (LocAliasUtils.areaCode(areaId) == null) {
+ throw new CoolException("搴撳尯鍙傛暟閿欒");
+ }
+ List<LocMast> oldLocMasts = this.selectBatchIds(locNos);
+ if (Cools.isEmpty(oldLocMasts)) {
+ throw new CoolException("鏈壘鍒拌淇敼鐨勫簱浣�");
+ }
+ Set<Integer> affectedAreaIds = new HashSet<>();
+ affectedAreaIds.add(areaId);
+ List<LocMast> updates = new ArrayList<>();
+ Date now = new Date();
+ for (LocMast oldLocMast : oldLocMasts) {
+ if (oldLocMast.getAreaId() != null) {
+ affectedAreaIds.add(oldLocMast.getAreaId());
+ }
+ LocMast update = new LocMast();
+ update.setLocNo(oldLocMast.getLocNo());
+ update.setAreaId(areaId);
+ update.setModiUser(userId);
+ update.setModiTime(now);
+ updates.add(update);
+ }
+ if (!this.updateBatchById(updates)) {
+ throw new CoolException("鎵归噺淇敼搴撳尯澶辫触");
+ }
+ rebuildAliasByAreas(affectedAreaIds, userId);
+ }
+
+ @Override
+ public List<String> selectLocNosByNoOrAlias(String condition) {
+ List<String> locNos = new ArrayList<>();
+ if (Cools.isEmpty(condition)) {
+ return locNos;
+ }
+ List<LocMast> locMasts = this.selectList(new EntityWrapper<LocMast>()
+ .andNew()
+ .like("loc_no", condition)
+ .or()
+ .like("loc_alias", condition));
+ for (LocMast locMast : locMasts) {
+ locNos.add(locMast.getLocNo());
+ }
+ return locNos;
+ }
+
+ private Integer minRowByArea(Integer areaId, Integer currentRow) {
+ if (areaId == null) {
+ return null;
+ }
+ Integer minRow = this.baseMapper.selectMinRowByArea(areaId);
+ if (currentRow != null && (minRow == null || currentRow < minRow)) {
+ return currentRow;
+ }
+ return minRow;
+ }
+
+ private void rebuildAliasByAreas(Set<Integer> areaIds, Long userId) {
+ if (Cools.isEmpty(areaIds)) {
+ return;
+ }
+ List<LocMast> locMasts = this.selectList(new EntityWrapper<LocMast>().in("area_id", areaIds));
+ if (Cools.isEmpty(locMasts)) {
+ return;
+ }
+ Map<Integer, Integer> minRowByArea = new HashMap<>();
+ for (LocMast locMast : locMasts) {
+ Integer areaId = locMast.getAreaId();
+ Integer row = locMast.getRow1();
+ if (areaId == null || row == null) {
+ continue;
+ }
+ Integer minRow = minRowByArea.get(areaId);
+ if (minRow == null || row < minRow) {
+ minRowByArea.put(areaId, row);
+ }
+ }
+ List<LocMast> updates = new ArrayList<>();
+ Date now = new Date();
+ for (LocMast locMast : locMasts) {
+ LocMast update = new LocMast();
+ update.setLocNo(locMast.getLocNo());
+ update.setLocAlias(LocAliasUtils.buildAlias(
+ locMast.getAreaId(),
+ locMast.getRow1(),
+ locMast.getBay1(),
+ locMast.getLev1(),
+ minRowByArea.get(locMast.getAreaId())));
+ update.setModiUser(userId);
+ update.setModiTime(now);
+ updates.add(update);
+ }
+ if (!updates.isEmpty() && !this.updateBatchById(updates)) {
+ throw new CoolException("閲嶇畻搴撲綅鍒悕澶辫触");
+ }
+ }
@Autowired
private RowLastnoService rowLastnoService;
@@ -114,6 +293,11 @@
}
@Override
+ public List<LocMast> selectLocByLev(Integer lev) {
+ return this.baseMapper.selectLocByLev(lev);
+ }
+
+ @Override
public Boolean checkWhole(List<LocDetl> locDetls) {
return null;
}
--
Gitblit v1.9.1