From 4725ab4c1f4d0560097ae3469a42de23eb459056 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 16 十月 2025 09:57:41 +0800
Subject: [PATCH] wms功能完善
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 139 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 137 insertions(+), 2 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 45c15df..d22e201 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,16 +1,151 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.RowLastnoService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
+ @Autowired
+ private RowLastnoService rowLastnoService;
+
@Override
- public LocMast queryFreeLocMast(Integer row) {
- return this.baseMapper.queryFreeLocMast(row);
+ public LocMast queryFreeLocMast(Integer row, Short locType1) {
+ return this.baseMapper.queryFreeLocMast(row, locType1,1L);
+ }
+
+ @Override
+ public LocMast queryFreeLocMast(Integer row, Short locType1,Long type) {
+ return this.baseMapper.queryFreeLocMast(row, locType1,type);
+ }
+
+ @Override
+ public List<String> queryGroupEmptyStock(String sourceLocNo) {
+ if (Cools.isEmpty(sourceLocNo)) {
+ return null;
+ }
+ LocMast sourceStock = this.selectById(sourceLocNo);
+ if (Cools.isEmpty(sourceStock)) {
+ return null;
+ }
+ return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo(), 1L);
+ }
+
+ @Override
+ public List<String> queryGroupEmptyStock(String sourceLocNo,Long type) {
+ if (Cools.isEmpty(sourceLocNo)) {
+ return null;
+ }
+ LocMast sourceStock = this.selectById(sourceLocNo);
+ if (Cools.isEmpty(sourceStock)) {
+ return null;
+ }
+ return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo(), type);
+ }
+
+ @Override
+ public Boolean checkEmptyCount(LocMast locMast) {
+ if (locMast == null) {
+ return false;
+ }
+ return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),1L) > 1;
+ }
+
+ @Override
+ public Boolean checkEmptyCount(LocMast locMast,Long type) {
+ if (locMast == null) {
+ return false;
+ }
+ return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),type) > 1;
+ }
+
+ /*
+ *鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ * */
+// @Override
+// public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) {
+// if (curRow<nearRow){
+// return this.baseMapper.selectLocByLocStsPakInF1(locNos,1L);
+// }
+// return this.baseMapper.selectLocByLocStsPakInF2(locNos,1L);
+// }
+//
+// @Override
+// public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos,Long type) {
+// if (curRow<nearRow){
+// return this.baseMapper.selectLocByLocStsPakInF1(locNos,type);
+// }
+// return this.baseMapper.selectLocByLocStsPakInF2(locNos,type);
+// }
+
+ @Override
+ public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
+ if (curRow>nearRow){
+ return this.baseMapper.selectLocByLocStsPakInF1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ }
+ return this.baseMapper.selectLocByLocStsPakInF2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ }
+
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+ * */
+// @Override
+// public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos) {
+// if (curRow<nearRow){
+// return this.baseMapper.selectLocByLocStsPakInO1(locNos,1L);
+// }
+// return this.baseMapper.selectLocByLocStsPakInO2(locNos,1L);
+// }
+ @Override
+ public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
+ if (curRow>nearRow){
+ return this.baseMapper.selectLocByLocStsPakInO1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ }
+ return this.baseMapper.selectLocByLocStsPakInO2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ }
+
+ @Override
+ public Boolean checkWhole(List<LocDetl> locDetls) {
+ return null;
+ }
+
+ @Override
+ public Boolean checkWhole(List<LocDetl> locDetls,Long type) {
+ return null;
+ }
+
+ @Override
+ public List<LocMast> queryShallowLocFMast(Integer crnNo) {
+ return this.baseMapper.queryShallowLocFMast(crnNo,1L);
+ }
+
+ @Override
+ public List<LocMast> queryShallowLocFMast(Integer crnNo,Long type) {
+ return this.baseMapper.queryShallowLocFMast(crnNo,type);
+ }
+
+ @Override
+ public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo) {
+ if (crnNo==1){
+ return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev,1L);
+ }
+ return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,1L);
+ }
+
+ @Override
+ public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo,Long type) {
+ if (crnNo==1){
+ return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev,type);
+ }
+ return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,type);
}
}
--
Gitblit v1.9.1