From 7203d67cfa3a2fc1cab9b8985dfd35c1797207b1 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 06 十二月 2021 18:36:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/service/WrkMastService.java | 2 ++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 ++++--
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 5 +++++
src/main/resources/mapper/LocMastMapper.xml | 12 ++++++------
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 3 +++
src/main/java/com/zy/asrs/service/LocMastService.java | 2 ++
7 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index ed685a1..994beaf 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -13,6 +13,9 @@
@Repository
public interface LocMastMapper extends BaseMapper<LocMast> {
+ @Select("select distinct row1 from asr_loc_mast where crn_no = #{crnNo}")
+ List<Integer> queryDistinctRow(@Param("crnNo")Integer crnNo);
+
LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1, @Param("locType2") Short locType2, @Param("locType3") Short locType3);
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 4dea9b5..b1ad8b5 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -7,6 +7,8 @@
public interface LocMastService extends IService<LocMast> {
+ List<Integer> queryDistinctRow(Integer crnNo);
+
/**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index f5c3e5c..73b16c2 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -7,6 +7,8 @@
public interface WrkMastService extends IService<WrkMast> {
+ WrkMast selectByLocNo(String sourceLocNo);
+
int getWorkingMast(Integer devpNo);
List<WrkMast> selectToBeCompleteData();
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 12cd14e..7796d22 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -18,6 +18,11 @@
private RowLastnoService rowLastnoService;
@Override
+ public List<Integer> queryDistinctRow(Integer crnNo) {
+ return this.baseMapper.queryDistinctRow(crnNo);
+ }
+
+ @Override
public LocMast queryFreeLocMast(Integer row, Short locType1, Short locType2, Short locType3) {
return this.baseMapper.queryFreeLocMast(row, locType1, locType2, locType3);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 20f2d7c..89f2d25 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -24,6 +24,7 @@
import com.zy.ints.service.IoCompleteService;
import com.zy.ints.service.WaitMatchkLogService;
import com.zy.ints.service.WaitMatchkService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +37,7 @@
/**
* Created by vincent on 2020/6/11
*/
+@Slf4j
@Service
public class WorkServiceImpl implements WorkService {
static int i =1;
@@ -858,14 +860,14 @@
LocMast loc = null;
for (Integer row : rows) {
if (Utils.isDeepLoc(slaveProperties, row)) {
- loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
+ loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(),shallowLoc.getLocType2(),shallowLoc.getLocType3());
if (null != loc) { break; }
}
}
if (null == loc) {
for (Integer row : rows) {
if (Utils.isShallowLoc(slaveProperties, row)) {
- loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
+ loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(),shallowLoc.getLocType2(),shallowLoc.getLocType3());
if (null != loc) { break; }
}
}
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 63e7cd2..bf2a578 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -13,6 +13,11 @@
public class WrkMastServiceImpl extends ServiceImpl<WrkMastMapper, WrkMast> implements WrkMastService {
@Override
+ public WrkMast selectByLocNo(String sourceLocNo) {
+ return this.baseMapper.selectByLocNo(sourceLocNo);
+ }
+
+ @Override
public int getWorkingMast(Integer devpNo) {
return selectCount(new EntityWrapper<WrkMast>().eq("source_sta_no", devpNo).in("wrk_sts", 1, 6));
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index da76ae0..b28a165 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -46,12 +46,12 @@
<if test="locType1 != null">
and loc_type1 = #{locType1}
</if>
- <if test="locType2 != null">
- and loc_type2 = #{locType2}
- </if>
- <if test="locType3 != null">
- and loc_type3 = #{locType3}
- </if>
+<!-- <if test="locType2 != null">-->
+<!-- and loc_type2 = #{locType2}-->
+<!-- </if>-->
+<!-- <if test="locType3 != null">-->
+<!-- and loc_type3 = #{locType3}-->
+<!-- </if>-->
order by loc_sts desc ,lev1 asc,bay1 asc
</select>
</mapper>
--
Gitblit v1.9.1