From 77ce9b966a4965bf1d5bdcb1dbd8e76dd45a8c53 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 六月 2020 17:06:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4 +++-
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 4 ++--
src/main/java/com/zy/asrs/service/LocMastService.java | 2 +-
src/main/java/com/zy/common/service/CommonService.java | 8 ++++++--
5 files changed, 14 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 1dde7eb..5c690f8 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -11,7 +11,7 @@
@Repository
public interface LocMastMapper extends BaseMapper<LocMast> {
- @Select("select top 1 * from asr_loc_mast where row1=#{row} and loc_sts='O' and loc_type=#{locType} order by loc_type desc ,lev1 asc,bay1 asc")
- LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType") Integer locType);
+ @Select("select top 1 * from asr_loc_mast where row1=#{row} and loc_type='O' order by loc_type desc ,lev1 asc,bay1 asc")
+ LocMast queryFreeLocMast(@Param("row") Integer row);
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 4583f00..fe1da34 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -8,6 +8,6 @@
/**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
- LocMast queryFreeLocMast(Integer row, Integer locType);
+ LocMast queryFreeLocMast(Integer row);
}
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 5c6f1c7..45c15df 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -10,7 +10,7 @@
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
@Override
- public LocMast queryFreeLocMast(Integer row, Integer locType) {
- return this.baseMapper.queryFreeLocMast(row, locType);
+ public LocMast queryFreeLocMast(Integer row) {
+ return this.baseMapper.queryFreeLocMast(row);
}
}
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 783dda8..e93822e 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -32,7 +32,7 @@
if (Cools.isEmpty(param.getDevpNo(), param.getList())) {
throw new CoolException(BaseRes.PARAM);
}
- // 绔欑偣鐘舵�佹娴�
+ // 婧愮珯鐐圭姸鎬佹娴�
basDevpService.checkSiteStatus(param.getDevpNo());
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(0);
@@ -47,6 +47,8 @@
String locNo = commonService.getLocNo(1, param.getDevpNo());
+
+
// if (staNo == null || staNo.get)
// 鑾峰彇鏈�鏂扮殑宸ヤ綔妗�
// WrkMast latestWrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().orderBy("appe_time"));
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fe380cf..f2819c7 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -120,10 +120,14 @@
BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
int inQty = staNo.getInQty();
if (staNo.getInEnable().equals("Y") && staNo.getAutoing().equals("Y") && inQty<2) {
- // 鏌ユ壘搴撲綅 todo
- LocMast locMast = locMastService.queryFreeLocMast(curRow, 1);
+ // 鏌ユ壘搴撲綅
+ LocMast locMast = locMastService.queryFreeLocMast(curRow);
+ if (Cools.isEmpty(locMast)) {
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
locNo = locMast.getLocNo();
+ // 鏇存柊搴撲綅鎺掑彿
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
} else {
--
Gitblit v1.9.1