From 8ae2f2dcfe7e263d42c21ed7644641c780445b95 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 16 一月 2026 17:45:50 +0800
Subject: [PATCH] 空板改余料回库优化
---
src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java | 83 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java
index b46c47b..0fc46fe 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java
@@ -1,12 +1,93 @@
package com.zy.asrs.service.impl;
import com.zy.asrs.mapper.LocAroundBindMapper;
+import com.zy.asrs.entity.BasDevice;
import com.zy.asrs.entity.LocAroundBind;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.param.InitDeviceLocParams;
+import com.zy.asrs.enums.LocStsType;
+import com.zy.asrs.service.BasDeviceService;
import com.zy.asrs.service.LocAroundBindService;
+import com.zy.asrs.service.LocMastService;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.core.exception.CoolException;
+
+import java.util.List;
+import java.util.Objects;
+
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
@Service("locAroundBindService")
-public class LocAroundBindServiceImpl extends ServiceImpl<LocAroundBindMapper, LocAroundBind> implements LocAroundBindService {
+public class LocAroundBindServiceImpl extends ServiceImpl<LocAroundBindMapper, LocAroundBind>
+ implements LocAroundBindService {
+
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private BasDeviceService basDeviceService;
+
+ /**
+ * 缁戝畾浣滀笟搴撲綅
+ *
+ * @param params
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R bindLocs(InitDeviceLocParams params) {
+ // 鏍￠獙鍙傛暟
+ if (Cools.isEmpty(params.getStartRow()) || Cools.isEmpty(params.getEndRow()) ||
+ Cools.isEmpty(params.getStartBay()) || Cools.isEmpty(params.getEndBay()) ||
+ Cools.isEmpty(params.getStartLev()) || Cools.isEmpty(params.getEndLev())) {
+ return R.error("鍙傛暟閿欒");
+ }
+ BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>()
+ .eq("dev_no", params.getDevNo()));
+ if (Objects.isNull(basDevice)) {
+ return R.error("鏈煡璇㈠埌璇ヨ澶�");
+ }
+
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .between("row1", params.getStartRow(), params.getEndRow())
+ .between("bay1", params.getStartBay(), params.getEndBay())
+ .eq("frozen", 0).eq("deleted", 0)
+ .between("lev1", params.getStartLev(), params.getEndLev())
+ .ne("loc_sts", LocStsType.LOC_STS_TYPE_X.type));
+ if (Cools.isEmpty(locMasts)) {
+ return R.error("鏈煡璇㈠埌绗﹀悎鏉′欢鐨勫簱浣�");
+ }
+
+ // 鏍￠獙搴撲綅鏄惁宸茬粦瀹�
+ for (LocMast mast : locMasts) {
+ LocAroundBind aroundBind = this.selectOne(new EntityWrapper<LocAroundBind>()
+ .eq("b_loc_no", mast.getLocNo()));
+ if (!Objects.isNull(aroundBind)) {
+ continue;
+ }
+ LocAroundBind bind = new LocAroundBind();
+ bind.setDevNo(params.getDevNo());
+ bind.setBlocNo(mast.getLocNo());
+ bind.setDevId(basDevice.getId());
+ if (!this.insert(bind)) {
+ throw new CoolException("缁戝畾搴撲綅澶辫触");
+ }
+
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", bind.getBlocNo()));
+ locMast.setLocSts(LocStsType.LOC_STS_TYPE_X.type);
+ locMast.setDeleted(1);
+ locMast.setFrozen(1);
+
+ if (!locMastService.updateById(locMast)) {
+ return R.error("鍘熷簱绂佺敤澶辫触锛侊紒");
+ }
+
+ }
+ return R.ok("缁戝畾搴撲綅鎴愬姛");
+ }
}
--
Gitblit v1.9.1