From 3971255dadf007563d83d887e8c2ef465242fc87 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 四月 2026 22:03:31 +0800
Subject: [PATCH] 双伸出库改成订单出库
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 4fe55fb..114a7cc 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -3,11 +3,13 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.mapper.WrkMastLogMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.InboundCameraCaptureService;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,21 @@
@Autowired
private WrkMastLogMapper wrkMastLogMapper;
+
+ @Autowired
+ private LocMastService locMastService;
+
+ @Override
+ public boolean insert(WrkMast entity) {
+ fillAreaId(entity);
+ return super.insert(entity);
+ }
+
+ @Override
+ public boolean updateById(WrkMast entity) {
+ fillAreaId(entity);
+ return super.updateById(entity);
+ }
@Override
public int getWorkingMast(Integer devpNo) {
@@ -147,4 +164,34 @@
}
}
}
+
+ private void fillAreaId(WrkMast wrkMast) {
+ if (wrkMast == null) {
+ return;
+ }
+ LocMast locMast = resolveAreaLocMast(wrkMast);
+ if (locMast != null) {
+ wrkMast.setAreaId(locMast.getAreaId());
+ }
+ }
+
+ private LocMast resolveAreaLocMast(WrkMast wrkMast) {
+ boolean outbound = wrkMast.getIoType() != null && wrkMast.getIoType() >= 100;
+ LocMast primary = outbound
+ ? selectLocMast(wrkMast.getSourceLocNo())
+ : selectLocMast(wrkMast.getLocNo());
+ if (primary != null) {
+ return primary;
+ }
+ return outbound
+ ? selectLocMast(wrkMast.getLocNo())
+ : selectLocMast(wrkMast.getSourceLocNo());
+ }
+
+ private LocMast selectLocMast(String locNo) {
+ if (Cools.isEmpty(locNo)) {
+ return null;
+ }
+ return locMastService.selectById(locNo);
+ }
}
--
Gitblit v1.9.1