From b0a40b8b4f2921d449e2d750cfeb56979cd563e1 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 13 九月 2025 16:57:10 +0800
Subject: [PATCH] #四向库入库规则
---
src/main/java/com/zy/asrs/service/WorkService.java | 5
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2
src/main/java/com/zy/asrs/service/LocDetlService.java | 5
src/main/resources/mapper/WaitPakinMapper.xml | 7
src/main/resources/mapper/LocDetlMapper.xml | 9
src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java | 5
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5
src/main/java/com/zy/common/web/WcsController.java | 348 ++++---------
src/main/java/com/zy/asrs/controller/WorkController.java | 14
src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java | 18
src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java | 2
/dev/null | 39 -
src/main/java/com/zy/asrs/service/WaitPakinService.java | 2
src/main/java/com/zy/common/web/param/SearchLocParam.java | 23
src/main/java/com/zy/asrs/utils/Utils.java | 161 +----
src/main/java/com/zy/common/properties/SlaveProperties.java | 6
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 107 ---
src/main/java/com/zy/common/service/CommonService.java | 684 ++++++---------------------
src/main/resources/application.yml | 8
19 files changed, 386 insertions(+), 1,064 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 7fd25fd..e17d4ba 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -144,18 +144,4 @@
return R.ok();
}
-// @RequestMapping("/create/waitPain/wrkMast/start")
-// @ManagerAuth(memo = "鐢熸垚浠诲姟")
-// public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) {
-// StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
-// return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
-// }
-
- @RequestMapping("/deal/preHave/start")
- @ManagerAuth(memo = "鍏堝叆鍝佸鐞�")
- public R dealPreHave(@RequestParam Integer wrkNo) {
- String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
- return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo);
- }
-
}
diff --git a/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
new file mode 100644
index 0000000..68db0ab
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.entity.result;
+
+import lombok.Data;
+
+@Data
+public class FindLocNoAttributeVo {
+
+ private String matnr = "";
+
+ private String specs = "";
+
+ private String batch = "";
+
+ private String grade = "";
+
+ private String brand = "";
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 811ae94..c70a85d 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -37,6 +37,8 @@
@Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.matnr = #{matnr} AND lm.bay1 >= 10 AND lm.bay1 <=20 AND (lm.row1 >= #{start} AND lm.row1 <= #{end}) AND lm.loc_sts = 'F' AND DateDiff(dd, ld.appe_time, getdate()) = 0) ORDER BY ld.appe_time ASC")
List<String> selectSameDetlToday(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
+ List<String> getSameDetlList(@Param("matnr") String matnr);
+
List<LocDetl> getStockStatis(Map<String, Object> map);
Integer getStockStatisCount(Map<String, Object> map);
diff --git a/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java b/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
index 1ab9a07..b0bf7e2 100644
--- a/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
@@ -9,4 +9,6 @@
@Repository
public interface WaitPakinMapper extends BaseMapper<WaitPakin> {
+ int updateIoStatus(String ioStatus, String locNo, String zpallet);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 4a72ba4..fa7f683 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -32,6 +32,11 @@
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
+ /**
+ * 鑾峰彇鐩稿悓瑙勬牸璐х墿
+ */
+ List<String> getSameDetlList(String matnr);
+
Page<LocDetl> getStockStatis(Page<LocDetl> page);
Double getSumAnfme(String matnr);
diff --git a/src/main/java/com/zy/asrs/service/WaitPakinService.java b/src/main/java/com/zy/asrs/service/WaitPakinService.java
index b09602a..3c9ab65 100644
--- a/src/main/java/com/zy/asrs/service/WaitPakinService.java
+++ b/src/main/java/com/zy/asrs/service/WaitPakinService.java
@@ -5,4 +5,6 @@
public interface WaitPakinService extends IService<WaitPakin> {
+ boolean updateIoStatus(String ioStatus, String locNo, String zpallet);
+
}
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 239535b..b119a80 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -82,9 +82,4 @@
*/
StartupDto createWaitPainWrkMastStart(List<WaitPakin> list, Long userId);
- /**
- * 閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
- */
- String dealPreHaveStart(Integer wrkNo, Long userId);
-
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index bdfdbae..dbd1958 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -8,6 +8,7 @@
import com.zy.asrs.service.LocDetlService;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -48,6 +49,10 @@
return this.baseMapper.selectSameDetlToday(matnr, start, end);
}
+ @Override
+ public List<String> getSameDetlList(String matnr) {
+ return this.baseMapper.getSameDetlList(matnr);
+ }
@Override
public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
diff --git a/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
index fada025..b164f7a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
@@ -9,4 +9,9 @@
@Service("waitPakinService")
public class WaitPakinServiceImpl extends ServiceImpl<WaitPakinMapper, WaitPakin> implements WaitPakinService {
+ @Override
+ public boolean updateIoStatus(String ioStatus, String locNo, String zpallet) {
+ return this.baseMapper.updateIoStatus(ioStatus, locNo, zpallet) > 0;
+ }
+
}
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 b9ae807..0c1fc9d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -12,6 +12,7 @@
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.*;
@@ -91,7 +92,11 @@
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0);
+
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ findLocNoAttributeVo.setMatnr(matnrs.get(0));
+
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, findLocNoAttributeVo, locTypeDto, param.getBarcode());
// 鐢熸垚宸ヤ綔鍙�
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
@@ -381,7 +386,10 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto, 0);
+
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, findLocNoAttributeVo, locTypeDto, "");
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -966,101 +974,6 @@
LocTypeDto locTypeDto = new LocTypeDto();
locTypeDto.setLocType1((short) 1);
return null;
- }
-
- @Override
- @Transactional
- public String dealPreHaveStart(Integer wrkNo, Long userId) {
- WrkMast wrkMast = wrkMastService.selectById(wrkNo);
- if (wrkMast == null) {
- throw new CoolException("浠诲姟宸插け鏁�");
- }
- String locNo = wrkMast.getLocNo();
- LocMast locMast = locMastService.selectById(locNo);
- assert locMast != null;
- RowLastno rowLastno = rowLastnoService.findBySection(locMast.getRow1());
- assert rowLastno != null;
-
- // 鐩爣搴撲綅
- LocMast targetLoc = null;
-
- for (int curRow = rowLastno.getsRow(); curRow<=rowLastno.geteRow(); curRow++) {
-
- if (Utils.isShallowLoc(slaveProperties, curRow)) {
- Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
- targetLoc = locMastService.queryFreeLocMast(deepRow, locMast.getLocType1());
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(targetLoc)) {
- continue;
- }
- }
- if (Cools.isEmpty(targetLoc)) {
- targetLoc = locMastService.queryFreeLocMast(curRow, locMast.getLocType1());
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(targetLoc)) {
- continue;
- }
- // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
- if (null != targetLoc && Utils.isShallowLoc(slaveProperties, targetLoc.getLocNo())) {
- LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, targetLoc.getLocNo()));
- if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
- continue;
- }
- }
- // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
- if (null != targetLoc && Utils.isDeepLoc(slaveProperties, targetLoc.getLocNo())) {
- LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, targetLoc.getLocNo()));
- if (!shallowLoc.getLocSts().equals("O")) {
- continue;
- }
- }
- }
-
- if (!Cools.isEmpty(targetLoc)) {
- break;
- }
-
- }
-
- if (targetLoc == null) {
- throw new CoolException("鎿嶄綔澶辫触锛屽綋鍓嶄粨搴撴壘涓嶅埌绌哄簱浣�");
- }
-
- Date now = new Date();
- // 淇敼宸ヤ綔妗�
- StaDesc staDesc = staDescService.queryCrnStn(targetLoc.getCrnNo());
- if (Cools.isEmpty(staDesc)) {
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
- wrkMast.setWrkSts(2L);
- wrkMast.setLocNo(targetLoc.getLocNo());
- wrkMast.setStaNo(staDesc.getCrnStn());
- wrkMast.setCrnNo(targetLoc.getCrnNo());
- wrkMast.setModiTime(now);
- wrkMast.setModiUser(userId);
- wrkMast.setPreHave("N");
- if (!wrkMastService.updateById(wrkMast)) {
- throw new CoolException("淇敼宸ヤ綔妗ｅけ璐�");
- }
- // 淇敼搴撲綅鐘舵�� O ===>>> S
- if (targetLoc.getLocSts().equals("O")){
- targetLoc.setLocSts("S"); // S.鍏ュ簱棰勭害
- targetLoc.setModiUser(userId);
- targetLoc.setModiTime(now);
- if (!locMastService.updateById(targetLoc)){
- throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException(targetLoc.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
- }
- // 绂佺敤寮傚父搴撲綅
-// locMast.setLocSts("X"); // X.绂佺敤
-// locMast.setModiUser(userId);
-// locMast.setModiTime(now);
-// if (!locMastService.updateById(locMast)){
-// throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
-// }
- return targetLoc.getLocNo();
}
}
diff --git a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java b/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
deleted file mode 100644
index cd6811b..0000000
--- a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.zy.asrs.task;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.WorkService;
-import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.CheckDeepHandler;
-import com.zy.asrs.utils.Utils;
-import com.zy.common.properties.SlaveProperties;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-@Component
-@Slf4j
-public class CheckDeepScheduler {
-
- @Value("${wcs-slave.doubleDeep}")
- private boolean confirmDeep;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private WorkService workService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private SlaveProperties slaveProperties;
-
- @Autowired
- private CheckDeepHandler checkDeepHandler;
-
-// /**
-// * 灏嗕袱涓繁搴撲綅鍚堝苟涓烘繁娴呭簱浣�,鐗╂枡鍙风浉鍚岋紝婧愬簱浣嶅叆搴撴棩鏈熸棭浜庣洰鏍囧簱浣嶅搴旀繁搴撲綅鍏ュ簱鏃ユ湡锛屽簱浣嶇姸鎬侀兘涓篎
-// */
-// @Scheduled(cron = "0/30 * * * * ?")
-// private void execute() throws ParseException {
-// if (!confirmDeep) return;
-//
-// ReturnT<String> result = checkDeepHandler.start();
-// if (!result.isSuccess()) {
-// log.error("搴撲綅绉昏浆===>>娴呭簱浣嶇Щ杞埌娣卞簱浣嶅け璐�");
-// }
-// }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java b/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
deleted file mode 100644
index 86c1498..0000000
--- a/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.zy.asrs.task;
-
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.ErrorStockHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by vincent on 2020/7/7
- */
-@Component
-public class ErrorStockScheduler {
-
- private static final Logger log = LoggerFactory.getLogger(ErrorStockScheduler.class);
-
- @Autowired
- private ErrorStockHandler errorStockHandler;
-
-// @Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
- ReturnT<String> returnT = errorStockHandler.start();
- if (!returnT.isSuccess()) {
- log.error(returnT.getMsg());
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/PlcLogScheduler.java b/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
deleted file mode 100644
index ada5011..0000000
--- a/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.zy.asrs.task;
-
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.PlcLogHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by vincent on 2020/7/7
- */
-@Component
-public class PlcLogScheduler {
-
- private static final Logger log = LoggerFactory.getLogger(PlcLogScheduler.class);
-
- @Autowired
- private PlcLogHandler plcLogHandler;
-
-// @Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
- ReturnT<String> returnT = plcLogHandler.start();
- if (!returnT.isSuccess()) {
- log.error(returnT.getMsg());
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
deleted file mode 100644
index 9eb6b97..0000000
--- a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package com.zy.asrs.task.handler;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.*;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.utils.Utils;
-import com.zy.common.properties.SlaveProperties;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2020/7/6
- */
-@Service
-@Slf4j
-public class CheckDeepHandler extends AbstractHandler<String> {
-
- @Value("${wcs-slave.doubleDeep}")
- private boolean confirmDeep;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private WorkService workService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private BasCrnpService basCrnpService;
- @Autowired
- private SlaveProperties slaveProperties;
-
- @Transactional
- public synchronized ReturnT<String> start() {
- try {
- for (int crnNo = 1; crnNo < 3; crnNo++){
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("crn_no",crnNo)
- .last(" and wrk_sts in (2,3,4,11,12)")
- );
- if (wrkMasts.size() > 0) continue;
-
- //鏆傚仠绉诲簱
- BasCrnp crnp = basCrnpService.selectById(crnNo);
- if(!Cools.isEmpty(crnp) && !Cools.isEmpty(crnp.getTankQty()) && crnp.getTankQty()==0){
- continue;
- }
-
- List<LocMast> locMasts = locMastService.queryShallowLocFMast(crnNo);
- if (null == locMasts) continue;
-
- for (LocMast sourceLoc : locMasts){
- String deep = Utils.getDeepLoc(slaveProperties, sourceLoc.getLocNo());
- LocMast destLoc = locMastService.selectById(deep);
-
- if(!Cools.isEmpty(sourceLoc) && !Cools.isEmpty(destLoc)) {
- //鏌ユ壘婧愬簱浣嶆槸鍚︽湁杞Щ浠诲姟,濡傛灉鏈�,涓嶇敓鎴愬簱浣嶇Щ杞�
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
- .eq("source_loc_no", sourceLoc.getLocNo()));
- if (Cools.isEmpty(wrkMast) && destLoc.getLocSts().equals("O") &&
- (sourceLoc.getLocSts().equals("F") || sourceLoc.getLocSts().equals("D"))) {
- workService.locMove(sourceLoc.getLocNo(), deep, 1L);
- }
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
-
- /**
- * 閬嶅巻搴撳瓨涓紝娴呭簱浣嶇姸鎬丗锛屾繁搴撲綅鐘舵�丱鐨勬暟鎹紝鐢熸垚搴撲綅绉昏浆宸ヤ綔妗ｅ皢娴呭簱浣嶇Щ杞埌瀵瑰簲娣卞簱浣嶄腑鍘�
- */
-// private void locMoveToDeep(int crnNo){
-// if (!confirmDeep) return;
-// List<LocMast> locMasts = locMastService.queryShallowLocFMast();
-//
-//
-// if (null == locMasts) return;
-//
-// for (LocMast sourceLoc : locMasts){
-// String deep = Utils.getDeepLoc(slaveProperties, sourceLoc.getLocNo());
-// LocMast destLoc = locMastService.selectById(deep);
-//
-// if(!Cools.isEmpty(sourceLoc) && !Cools.isEmpty(destLoc)) {
-// //鏌ユ壘婧愬簱浣嶆槸鍚︽湁杞Щ浠诲姟,濡傛灉鏈�,涓嶇敓鎴愬簱浣嶇Щ杞�
-// WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
-// .eq("source_loc_no", sourceLoc.getLocNo()));
-// if (Cools.isEmpty(wrkMast) && destLoc.getLocSts().equals("O") &&
-// (sourceLoc.getLocSts().equals("F") || sourceLoc.getLocSts().equals("D"))) {
-// workService.locMove(sourceLoc.getLocNo(), deep, 1L);
-// }
-// }
-// }
-//
-// }
-
-// @Transactional
-// public synchronized ReturnT<String> start1() {
-// try {
-// for (int crnNo = 1; crnNo < 6; crnNo++){
-// List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
-// .eq("crn_no",crnNo)
-// .last(" and wrk_sts in (2,3,4,11,12)")
-// );
-// if (wrkMasts.size() > 0) continue;
-//
-// //鏆傚仠绉诲簱
-// BasCrnp crnp = basCrnpService.selectById(crnNo);
-// if(!Cools.isEmpty(crnp) && crnp.getOrigin()!=0){
-// continue;
-// }
-//
-// //閬嶅巻搴撳瓨涓紝娣辨祬搴撲綅鐘舵�侀兘涓篎锛岀墿鏂欎笉鐩稿悓锛屾垨鑰呮祬搴撲綅鍏ュ簱鏃ユ湡姣旀繁搴撲綅鏃╃殑搴撲綅锛屽仛搴撲綅绉昏浆绉诲埌鏂扮殑娣卞簱浣嶄腑鍘�
-// boolean flag0 = false;
-// List<LocMast> locMasts = locMastService.queryNeedMoveShallLoc(crnNo);
-// for (LocMast locMast : locMasts) {
-// //澶氱瑪鏄庣粏鐨勪笉鍋氱Щ杞皟鏁�
-// List<LocDetl> shallowLocDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
-// .eq("loc_no", locMast.getLocNo()));
-// String deepLoc = Utils.getDeepLoc(slaveProperties, locMast.getLocNo());
-// List<LocDetl> deepLocDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
-// .eq("loc_no", deepLoc));
-//
-// if ((!Cools.isEmpty(shallowLocDetls) && shallowLocDetls.size()>1)
-// || (!Cools.isEmpty(deepLocDetls) && deepLocDetls.size()>1)) {
-// continue;
-// }
-//
-// LocMast targetLoc = locMastService.queryEmptyDeepLoc(crnNo);
-// if(!Cools.isEmpty(targetLoc)) {
-// workService.locMove(locMast.getLocNo(), targetLoc.getLocNo(), 1L);
-// log.info("娴呭簱浣嶇Щ杞埌娣卞簱浣�:鐢熸垚搴撲綅绉昏浆浠诲姟鎴愬姛[娴呭埌娣盷===>>" + locMast.getLocNo() + "---" + targetLoc.getLocNo());
-// flag0 = true;
-// }
-// break;
-// }
-// if(flag0) continue;
-//
-//// List<LocMast> ignoreLocs = new ArrayList<>();
-// List<LocMast> allDeeps = locMastService.selectAllDeepLoc(crnNo);
-// for (LocMast sourceDeep : allDeeps) {
-//
-// LocDetl sourceLoc = locDetlService.selectOne(new EntityWrapper<LocDetl>()
-// .eq("loc_no", sourceDeep.getLocNo()).orderBy("mat_no"));
-// if(Cools.isEmpty(sourceLoc)){
-// continue;
-// }
-//
-// boolean moveFlag = false;//姣忔鎵ц涓�绗�
-//// //濡傛灉杩欎釜搴撲綅宸茬粡琚搷浣滆繃浜�,鐩存帴璺宠繃
-//// Boolean flag = false;
-//// for (LocMast ignoreLoc : ignoreLocs) {
-//// if (ignoreLoc.getLocNo() == sourceDeep.getLocNo()) {
-//// flag = true;
-//// break;
-//// }
-//// }
-//// if (flag) {
-//// continue;
-//// }
-//
-// List<LocMast> allDeepsWithCrnNo = locMastService.selectAllDeepLocWithCrnNo(sourceDeep.getCrnNo(),
-// sourceLoc.getMatNo(), sourceLoc.getItemBatch(), sourceLoc.getSpecs());
-// for (LocMast targetDeep : allDeepsWithCrnNo) {
-// if(targetDeep.getLocNo().equals(sourceDeep.getLocNo())){
-// continue;
-// }
-//// LocDetl sourceLoc = locDetlService.selectOne(new EntityWrapper<LocDetl>()
-//// .eq("loc_no", sourceDeep.getLocNo()));
-//
-// LocDetl targetLoc = locDetlService.selectOne(new EntityWrapper<LocDetl>()
-// .eq("loc_no", targetDeep.getLocNo()));
-// //澶氱瑪鏄庣粏鐨勪笉鍋氱Щ杞皟鏁�
-// List<LocDetl> sourceLocDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
-// .eq("loc_no", sourceDeep.getLocNo()));
-// List<LocDetl> targetLocDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
-// .eq("loc_no", targetDeep.getLocNo()));
-//
-// if (Cools.isEmpty(targetLoc)
-// || (!Cools.isEmpty(sourceLocDetls) && sourceLocDetls.size()>1)
-// || (!Cools.isEmpty(targetLocDetls) && targetLocDetls.size()>1)) {
-// continue;
-// }
-//
-// //鐗╂枡鍙风浉鍚岋紝婧愬簱浣嶅叆搴撴棩鏈熸棭浜庣洰鏍囧簱浣嶅搴旀繁搴撲綅鍏ュ簱鏃ユ湡锛屽簱浣嶇姸鎬侀兘涓篎
-// if (sourceLoc.getMatNo().equals(targetLoc.getMatNo())
-// && sourceLoc.getItemBatch().equals(targetLoc.getItemBatch())
-// && sourceLoc.getSpecs().equals(targetLoc.getSpecs())
-// && sourceLoc.getAppeTime().getTime() < targetLoc.getAppeTime().getTime()
-// && sourceDeep.getLocSts().equals("F") && targetDeep.getLocSts().equals("F")) {
-//
-//// System.out.println("鎴愬姛: "+sourceDeep +"-----" +targetDeep);
-// String shallow = convertShallow(targetDeep.getLocNo());
-// LocMast shallowLoc = locMastService.selectById(shallow);
-// if(!Cools.isEmpty(shallowLoc) && shallowLoc.getLocSts().equals("O")) {
-// workService.locMove(sourceDeep.getLocNo(), shallow, 1L);
-// log.info("娣卞簱浣嶅悎骞跺畾鏃朵换鍔�:鐢熸垚搴撲綅绉昏浆浠诲姟鎴愬姛[娣卞埌娴匽===>>" + sourceDeep.getLocNo() + "---" + shallow);
-// moveFlag=true;
-//// ignoreLocs.add(sourceDeep);
-//// ignoreLocs.add(targetDeep);
-// break;
-// }
-// }
-// }
-// if(moveFlag) break;
-// }
-//
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-// return FAIL.setMsg(e.getMessage());
-// }
-// return SUCCESS;
-// }
-
- /**
- * 灏嗘繁搴撲綅杞负瀵瑰簲娴呭簱浣�
- * @param deep
- * @return
- */
- private String convertShallow(String deep){
- String shallLoc = "";
- Integer mastInt = Integer.parseInt(deep.substring(0, 2));
- if (mastInt % 2 == 0){
- mastInt -= 1;
- }else if (mastInt % 2 == 1){
- mastInt += 1;
- }
- if (mastInt <10){
- shallLoc = "0" + mastInt+ deep.substring(2,7);
- }else {
- shallLoc = mastInt+ deep.substring(2,7);
- }
- return shallLoc;
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/handler/ErrorStockHandler.java b/src/main/java/com/zy/asrs/task/handler/ErrorStockHandler.java
deleted file mode 100644
index c0e231d..0000000
--- a/src/main/java/com/zy/asrs/task/handler/ErrorStockHandler.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.zy.asrs.task.handler;
-
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by vincent on 2020/7/7
- */
-@Service
-public class ErrorStockHandler extends AbstractHandler<String> {
-
- @Autowired
- private JdbcTemplate jdbcTemplate;
-
- @Transactional
- public ReturnT<String> start() {
- try {
- String sql = "SELECT distinct a.loc_no as locNo FROM asr_loc_mast a,asr_loc_detl b where a.loc_no=b.loc_no and (a.loc_sts ='O' or a.loc_sts ='D')";
- List<Map<String, Object>> result = jdbcTemplate.queryForList(sql);
- if (!result.isEmpty()) {
- for (Map<String, Object> map : result) {
- int delCount = jdbcTemplate.update("delete from asr_loc_detl where loc_no=?;", map.get("locNo"));
- System.out.println(delCount);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java b/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
deleted file mode 100644
index d2cecf1..0000000
--- a/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.zy.asrs.task.handler;
-
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-/**
- * Created by vincent on 2020/7/7
- */
-@Service
-public class PlcLogHandler extends AbstractHandler<String> {
-
- @Autowired
- private JdbcTemplate jdbcTemplate;
-
- @Transactional
- public ReturnT<String> start() {
- try {
- // 涓嬩綅鏈哄懡浠よ浆鍘嗗彶妗�
- int updateCount = jdbcTemplate.update("insert into asr_stk_hplc select * from asr_stk_plcm where dateadd(day,7,appe_time) <= getdate();");
- if (updateCount > 0) {
- int deleteCount = jdbcTemplate.update("delete from asr_stk_plcm where dateadd(day,7,io_time) <= getdate();");
- if (deleteCount <= 0) {
- exceptionHandle("鍫嗗灈鏈�&PLC鍛戒护杞巻鍙叉。閿欒 ! ");
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index e80f7e5..783ec32 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -6,6 +6,7 @@
import java.text.DecimalFormat;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -37,103 +38,6 @@
}
/**
- * 鍒ゆ柇鏄惁涓烘繁搴撲綅
- */
- public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo){
- if (slaveProperties.isDoubleDeep()) {
- int row = getRow(locNo);
- return slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
- }
- }
-
- /**
- * 鍒ゆ柇鏄惁涓烘繁搴撲綅
- */
- public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row){
- if (slaveProperties.isDoubleDeep()) {
- return slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
- }
- }
-
- /**
- * 鍒ゆ柇鏄惁涓烘祬搴撲綅
- */
- public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo){
- if (slaveProperties.isDoubleDeep()) {
- int row = getRow(locNo);
- return !slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
- }
- }
-
- /**
- * 鍒ゆ柇鏄惁涓烘祬搴撲綅
- */
- public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row){
- if (slaveProperties.isDoubleDeep()) {
- return !slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
- }
- }
-
- /**
- * 鑾峰彇 娣卞簱浣嶅搴旂殑娴呭簱浣嶅彿
- */
- public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
- int row = getRow(deepLoc);
- int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
- return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
- }
-
- /**
- * 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
- */
- public static Integer getShallowRow(SlaveProperties slaveProperties, Integer deepRow) {
- int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
- return remainder == 1 ? (deepRow + 1) : (deepRow - 1);
- }
-
- /**
- * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿
- */
- public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
- int row = getRow(shallowLoc);
- int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int targetRow;
- if (remainder == 2) {
- targetRow = row - 1;
- } else if (remainder == 3) {
- targetRow = row + 1;
- } else {
- throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
- }
- return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
- }
-
- /**
- * 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
- */
- public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
- int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
- int targetRow;
- if (remainder == 2) {
- targetRow = shallowRow - 1;
- } else if (remainder == 3) {
- targetRow = shallowRow + 1;
- } else {
- throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
- }
- return targetRow;
- }
-
- /**
* 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
*/
public static int getRow(String locNo) {
@@ -144,32 +48,51 @@
}
/**
- * 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
+ * 閫氳繃搴撲綅鍙疯幏鍙� 鍒�
*/
- public static void toDeepIfEmptyByShallow(String shallowLoc) {
- int row = getRow(shallowLoc);
- int remainder = (int) Arith.remainder(row, 4);
- int targetRow = 0;
- if (remainder == 2) {
- targetRow = row - 1;
- } else if (remainder == 3) {
- targetRow = row + 1;
- } else {
- throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+ public static int getBay(String locNo) {
+ if (!Cools.isEmpty(locNo)) {
+ return Integer.parseInt(locNo.substring(2, 5));
}
- String targetLoc = zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
-
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
- public static void main(String[] args) {
- SlaveProperties slaveProperties = new SlaveProperties();
- slaveProperties.setDoubleDeep(true);
- List<Integer> list = new ArrayList<>();
- list.add(1);list.add(4);list.add(5);list.add(8);list.add(9);list.add(12);
- slaveProperties.setDoubleLocs(list);
- slaveProperties.setGroupCount(4);
- Integer deepRow = getDeepRow(slaveProperties, 6);
- System.out.println(deepRow);
+ /**
+ * 閫氳繃搴撲綅鍙疯幏鍙� 灞�
+ */
+ public static int getLev(String locNo) {
+ if (!Cools.isEmpty(locNo)) {
+ return Integer.parseInt(locNo.substring(5, 7));
+ }
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+ public static String getLocNo(Number row, Number bay, Number lev) {
+ return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
+ }
+
+ public static List<Integer> getLocRowGroupAsc(SlaveProperties slaveProperties, Integer row) {
+ List<List<Integer>> locGroupAsc = slaveProperties.getLocGroupAsc();
+ for (List<Integer> group : locGroupAsc) {
+ if (group.contains(row)) {
+ List<Integer> copy = new ArrayList<>(group);
+ return copy;
+ }
+ }
+
+ throw new RuntimeException(row + "鎺�,鏈畾涔夊簱浣嶇粍");
+ }
+
+ public static List<Integer> getLocRowGroupDesc(SlaveProperties slaveProperties, Integer row) {
+ List<List<Integer>> locGroupAsc = slaveProperties.getLocGroupAsc();
+ for (List<Integer> group : locGroupAsc) {
+ if (group.contains(row)) {
+ List<Integer> copy = new ArrayList<>(group);
+ Collections.reverse(copy);
+ return copy;
+ }
+ }
+
+ throw new RuntimeException(row + "鎺�,鏈畾涔夊簱浣嶇粍");
}
}
diff --git a/src/main/java/com/zy/common/properties/SlaveProperties.java b/src/main/java/com/zy/common/properties/SlaveProperties.java
index c5184c4..17dda16 100644
--- a/src/main/java/com/zy/common/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/common/properties/SlaveProperties.java
@@ -15,10 +15,6 @@
@ConfigurationProperties(prefix = "wcs-slave")
public class SlaveProperties {
- private boolean doubleDeep;
-
- private List<Integer> doubleLocs = new ArrayList<>();
-
- private int groupCount;
+ private List<List<Integer>> locGroupAsc = new ArrayList<>();
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 81a7b5f..c3ccb4a 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,26 +1,21 @@
package com.zy.common.service;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
-import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
-import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -90,405 +85,196 @@
return workNo;
}
+
/**
* 妫�绱㈠簱浣嶅彿
*
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞宸ヤ綔绫诲瀷
- * @param sourceStaNo 婧愮珯
- * @param matNos 鍟嗗搧缂栧彿闆嗗悎
+ * @param staDescId 璺緞ID
+ * @param sourceStaNo 婧愮珯
+ * @param findLocNoAttributeVo 灞炴��
+ * @param locTypeDto 绫诲瀷
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo4(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
- StartupDto startupDto = new StartupDto();
- if (sourceStaNo == 101 || sourceStaNo == 103) {
- whsType = 1;
- } else if (sourceStaNo == 105 || sourceStaNo == 107) {
- whsType = 2;
- } else {
- throw new CoolException("绔欑偣鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto, String barcode) {
+ StartupDto startupDto = null;
+ StringBuilder builder = new StringBuilder();
+ try {
+ startupDto = searchLocNoByCrnNo(staDescId, sourceStaNo, findLocNoAttributeVo, locTypeDto);
+ } catch (Exception e) {
+ builder.append(e.getMessage()).append(",");
}
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
- if (Cools.isEmpty(rowLastno)) {
- throw new CoolException("1鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ if(startupDto == null) {
+ builder.append("鎵句笉鍒扮┖搴撲綅");
+ throw new CoolException(builder.toString());
}
- // ===============>>>> 寮�濮嬫墽琛�
- int curRow = rowLastno.getCurrentRow();
- int sRow = rowLastno.getsRow();
- int eRow = rowLastno.geteRow();
- int crn_qty = rowLastno.getCrnQty();
- int rowCount = eRow - sRow + 1;
- // 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
- // 鐩爣搴撲綅
- LocMast locMast = null;
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matNos)) {
- List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow);
- for (String locNo : locNos) {
- if (Utils.isShallowLoc(slaveProperties, locNo)) {
- continue;
- }
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- locMast = shallowLoc;
- crnNo = locMast.getCrnNo();
- break;
- }
- }
- }
- }
- }
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- if (staDescId == 10) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
- if (locMasts.size() > 0) {
- for (LocMast loc : locMasts) {
- if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
- continue;
- }
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- if (shallowLoc.getLocType1() < locTypeDto.getLocType1()) {
- continue;
- }
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- locMast = shallowLoc;
- crnNo = locMast.getCrnNo();
- break;
- }
- }
- }
- }
- }
-
- // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- if (null == locMast) {
- Shelves shelves = new Shelves(rowCount, crn_qty);
- int divides = (int) Arith.divides(1, curRow - 1, 4);
- curRow = (int) Arith.remainder(curRow, 4);
- if (curRow == 0) {
- curRow = 4;
- }
- for (int i = 0; i < shelves.group; i++) {
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- Integer crnNo1 = shelves.get(curRow);
- crnNo1 = crnNo1 + divides * 1;
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
- curRow = curRow + divides * 4;
- break;
- }
- }
- }
-
- if (crnNo == 0) {
- throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
- }
- // 鑾峰彇鐩爣绔�
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
- StaDesc staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
- BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
- if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
- }
-
- // 鏇存柊搴撲綅鎺掑彿
- rowLastno.setCurrentRow(curRow);
- rowLastnoService.updateById(rowLastno);
-
- // 寮�濮嬫煡鎵惧簱浣� ==============================>>
-
- // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
- if (locMast == null) {
- if (Utils.isShallowLoc(slaveProperties, curRow)) {
- Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
- locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
- // todo:luxiaotao 濡傛灉鐢ㄦ祬鎺掓壘鍒扮殑娣卞簱浣嶏紝閭ｄ箞鍒欓渶瑕佸垽鏂繖涓繁搴撲綅瀵瑰簲鐨勬祬搴撲綅鏄惁鏈夎揣锛團銆乆銆丏锛�
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(locMast)) {
- locMast = null;
- }
- }
- if (Cools.isEmpty(locMast)) {
- locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(locMast)) {
- locMast = null;
- }
- // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
- if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
- LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
- if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
- locMast = null;
- }
- }
- // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
- if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
- LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
- if (!shallowLoc.getLocSts().equals("O")) {
- locMast = null;
- }
- }
- }
- }
-
- // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
- if (Cools.isEmpty(locMast)) {
- // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount) {
- times = times + 1;
- return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
- }
-
- // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
- if (locTypeDto.getLocType1() == 1) {
- locTypeDto.setLocType1((short) 2);
- return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
- }
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
- String locNo = locMast.getLocNo();
-
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = getWorkNo(0);
- // 杩斿洖dto
- startupDto.setWorkNo(workNo);
- startupDto.setCrnNo(crnNo);
- startupDto.setSourceStaNo(sourceStaNo);
- startupDto.setStaNo(staNo.getDevNo());
- startupDto.setLocNo(locNo);
return startupDto;
}
-
/**
* 妫�绱㈠簱浣嶅彿
*
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞宸ヤ綔绫诲瀷
- * @param sourceStaNo 婧愮珯
- * @param matNos 鍟嗗搧缂栧彿闆嗗悎
+ * @param staDescId 璺緞ID
+ * @param sourceStaNo 婧愮珯
+ * @param findLocNoAttributeVo 灞炴��
+ * @param locTypeDto 绫诲瀷
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
-// whsType = getWhsType(sourceStaNo, times);
+ public StartupDto searchLocNoByCrnNo(Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto) {
+ LocMast locMast = null;
+ if (staDescId == 10) {
+ //鎼滅储绌烘墭鐩�
+ locMast = searchEmptyPallet(locTypeDto);
+ }else {
+ //婊℃墭鐩�
+ locMast = searchMaxPallet(findLocNoAttributeVo, locTypeDto);
+ }
+
+ if(locMast == null) {
+ throw new CoolException("鎵句笉鍒扮鍚堝昂瀵哥殑绌哄簱浣�");
+ }
+
StartupDto startupDto = new StartupDto();
-// if (sourceStaNo < 200){
-// whsType = 1;
-// } else if (sourceStaNo > 199 && sourceStaNo < 300){
-// whsType = 2;
-// } else if (sourceStaNo > 299 && sourceStaNo < 400){
-// whsType = 3;
-// } else if (sourceStaNo > 399){
-// whsType = 4;
+// // 鑾峰彇鐩爣绔�
+// Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo).eq("crn_no", locMast.getCrnNo());
+// StaDesc staDesc = staDescService.selectOne(wrapper);
+// if (Cools.isEmpty(staDesc)) {
+// log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+// } else {
+// BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+// if (!staNo.getAutoing().equals("Y")) {
+// log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+// }
+// startupDto.setStaNo(staNo.getDevNo());
// }
-
- if (sourceStaNo == 101 || sourceStaNo == 103) {
- whsType = 1;
- } else if (sourceStaNo == 105 || sourceStaNo == 107) {
- whsType = 2;
- } else {
- throw new CoolException("绔欑偣鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
-
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
- if (Cools.isEmpty(rowLastno)) {
- throw new CoolException("1鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
-
- // ===============>>>> 寮�濮嬫墽琛�
- int curRow = rowLastno.getCurrentRow();
- int sRow = rowLastno.getsRow();
- int eRow = rowLastno.geteRow();
- int crn_qty = rowLastno.getCrnQty();
- int rowCount = eRow - sRow + 1;
- // 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
- // 鐩爣搴撲綅
- LocMast locMast = null;
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matNos)) {
- List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow);
- for (String locNo : locNos) {
- if (Utils.isShallowLoc(slaveProperties, locNo)) {
- continue;
- }
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- locMast = shallowLoc;
- crnNo = locMast.getCrnNo();
- break;
- }
- }
- }
- }
- }
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- if (staDescId == 10) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
- if (locMasts.size() > 0) {
- for (LocMast loc : locMasts) {
- if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
- continue;
- }
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- if (shallowLoc.getLocType1() < locTypeDto.getLocType1()) {
- continue;
- }
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- locMast = shallowLoc;
- crnNo = locMast.getCrnNo();
- break;
- }
- }
- }
- }
- }
-
- // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- if (null == locMast) {
- Shelves shelves = new Shelves(rowCount, crn_qty);
- int divides = (int) Arith.divides(1, curRow - 1, 4);
- curRow = (int) Arith.remainder(curRow, 4);
- if (curRow == 0) {
- curRow = 4;
- }
- for (int i = 0; i < shelves.group; i++) {
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- Integer crnNo1 = shelves.get(curRow);
- crnNo1 = crnNo1 + divides * 1;
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
- curRow = curRow + divides * 4;
- break;
- }
- }
- }
-
- if (crnNo == 0) {
- throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
- }
- // 鑾峰彇鐩爣绔�
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
- StaDesc staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
- BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
- if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
- }
-
- // 鏇存柊搴撲綅鎺掑彿
- rowLastno.setCurrentRow(curRow);
- rowLastnoService.updateById(rowLastno);
-
- // 寮�濮嬫煡鎵惧簱浣� ==============================>>
-
- // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
- if (locMast == null) {
- if (Utils.isShallowLoc(slaveProperties, curRow)) {
- Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
- locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
- // todo:luxiaotao 濡傛灉鐢ㄦ祬鎺掓壘鍒扮殑娣卞簱浣嶏紝閭ｄ箞鍒欓渶瑕佸垽鏂繖涓繁搴撲綅瀵瑰簲鐨勬祬搴撲綅鏄惁鏈夎揣锛團銆乆銆丏锛�
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(locMast)) {
- locMast = null;
- }
- }
- if (Cools.isEmpty(locMast)) {
- locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(locMast)) {
- locMast = null;
- }
- // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
- if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
- LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
- if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
- locMast = null;
- }
- }
- // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
- if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
- LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
- if (!shallowLoc.getLocSts().equals("O")) {
- locMast = null;
- }
- }
- }
- }
-
- // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
- if (Cools.isEmpty(locMast)) {
- // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount) {
- times = times + 1;
- return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
- }
-
- // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
- if (locTypeDto.getLocType1() == 1) {
- locTypeDto.setLocType1((short) 2);
- return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
- }
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
String locNo = locMast.getLocNo();
-
// 鐢熸垚宸ヤ綔鍙�
int workNo = getWorkNo(0);
// 杩斿洖dto
startupDto.setWorkNo(workNo);
- startupDto.setCrnNo(crnNo);
+ startupDto.setCrnNo(locMast.getCrnNo());
startupDto.setSourceStaNo(sourceStaNo);
- startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locNo);
return startupDto;
}
+ //鎼滅储婊℃墭鐩樺簱浣�
+ public LocMast searchMaxPallet(FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto) {
+ LocMast targetLocMast = null;
+ List<String> locNos = locDetlService.getSameDetlList(findLocNoAttributeVo.getMatnr());
+ for (String locNo : locNos) {
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locRowGroupDesc = Utils.getLocRowGroupDesc(slaveProperties, Utils.getRow(locNo));
+ for (Integer row : locRowGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc.getLocSts().equals("F")) {
+ continue;
+ } else if (deepLoc.getLocSts().equals("O")) {
+ targetLocMast = deepLoc;
+ break;
+ }else {
+ break;
+ }
+ }
+
+ }
+
+ if(targetLocMast == null) {
+ //鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .orderBy("lev1", true)
+ .orderBy("bay1", true));
+ for (LocMast locMast : locMasts) {
+ String locNo = locMast.getLocNo();
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locRowGroupDesc = Utils.getLocRowGroupDesc(slaveProperties, Utils.getRow(locNo));
+
+ boolean flag = true;
+ for (Integer row : locRowGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (!deepLoc.getLocSts().equals("O")) {
+ flag = false;
+ break;
+ }
+ }
+
+ if (flag) {
+ Integer firstRow = locRowGroupDesc.get(0);
+ String deepLocNo = Utils.getLocNo(firstRow, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ targetLocMast = deepLoc;
+ break;
+ }
+ }
+
+ }
+ return targetLocMast;
+ }
+
+ //鎼滅储绌烘墭鐩樺簱浣�
+ public LocMast searchEmptyPallet(LocTypeDto locTypeDto) {
+ LocMast targetLocMast = null;
+
+ List<LocMast> locMastsD = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "D"));
+ for (LocMast locMast : locMastsD) {
+ String locNo = locMast.getLocNo();
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locRowGroupDesc = Utils.getLocRowGroupDesc(slaveProperties, Utils.getRow(locNo));
+ for (Integer row : locRowGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc.getLocSts().equals("F")) {
+ continue;
+ } else if (deepLoc.getLocSts().equals("O")) {
+ targetLocMast = deepLoc;
+ break;
+ }else {
+ break;
+ }
+ }
+
+ }
+
+ if(targetLocMast == null) {
+ //鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .orderBy("lev1", true)
+ .orderBy("bay1", true));
+ for (LocMast locMast : locMasts) {
+ String locNo = locMast.getLocNo();
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locRowGroupDesc = Utils.getLocRowGroupDesc(slaveProperties, Utils.getRow(locNo));
+
+ boolean flag = true;
+ for (Integer row : locRowGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (!deepLoc.getLocSts().equals("O")) {
+ flag = false;
+ break;
+ }
+ }
+
+ if (flag) {
+ targetLocMast = locMast;
+ break;
+ }
+ }
+
+ }
+ return targetLocMast;
+ }
public static String zerofill(String msg, Integer count) {
if (msg.length() == count) {
@@ -502,158 +288,6 @@
}
return msgBuilder.toString();
}
- }
-
- /**
- * 鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰�
- */
- private Integer getWhsType(Integer sourceStaNo, int times) {
- if (times >= 16) {
- return 4;
- }
- switch (sourceStaNo) {
- case 173:
- case 176:
- case 180:
- case 185:
- return 1;
- case 189:
- case 194:
- case 198:
- case 202:
- return 2;
- case 206:
-// case 211:
-// case 215:
-// case 219:
-// case 223:
- case 227:
- return 3;
- case 305:
- case 303:
- case 301:
- return 4;
- default:
- throw new CoolException("鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰嶅け璐ワ紝鍏ュ簱绔欙細" + sourceStaNo);
- }
- }
-
- /**
- * @param waitPakin 缁勬墭鐨勭墿鏂�
- * @param arr 淇濆瓨椤哄簭灞�
- * @param d 涓嬫爣
- * @param locType 鐗╂枡鏄惁涓虹壒娈婄墿鏂�
- * @param locType1 1.婊℃墭 2.绌烘墭
- * @return
- */
- public LocMast getLocNo2(WaitPakin waitPakin, Integer[] arr, Integer d, Integer locType, Integer locType1) {
- LocMast locMast = null;
- try {
- //涓�.鏌ヨ鍏ュ簱璐х墿鏄惁鏄壒娈婃憜鏀捐揣鐗�
- if (locType == 2) {
- //鏌ユ壘灞傛爣璁扮殑
- LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("lev1", arr[d])
- .eq("loc_sts", "O")
- .eq("loc_type1", 2)
- .eq("loc_attribute", 1));
- if (!Cools.isEmpty(locMast1)) {
- locMast = locMast1;
- }
- } else {
- List<LocMast> locMasts = new ArrayList<>();
- //浜�.绌烘爤鏉挎憜鏀捐鍒�
- //1.璇ュ眰鐩稿悓绌烘爤鏉�
- //2.鑾峰緱locAttribute搴撲綅灞炴�т负1鐨勬墍鏈夊簱浣�
- //3.鏌ョ湅缁勯噷鏄惁杩樻湁绌轰綅
- if (locType1 == 2) {
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", arr[d])
- .eq("loc_sts", "D")
- .eq("loc_type1", 1)
- .eq("loc_attribute", 1));
- if (!Cools.isEmpty(locMasts)) {
- for (LocMast locMast1 : locMasts) {
- //4.鏌ョ湅璇ョ粍鏄惁鏈夐绾﹀叆搴撳拰棰勭害鍑哄簱鐨勫簱浣嶏紝鏈夌殑璇濈洿鎺ヨ烦杩囪缁�
- List<LocMast> locMasts2 = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("group1", locMast1.getGroup1())
- .in("loc_sts", "P", "Q", "R", "S"));
- if (!Cools.isEmpty(locMasts2)) {
- continue;
- }
- //5.鎵惧嚭鍚屼竴缁勭殑绌哄簱浣�
- //6.瀵规繁娴呭簱浣嶈繘琛屾帓搴�
- List<LocMast> locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("group1", locMast1.getGroup1())
- .eq("loc_sts", "O")
- .orderBy("locAttribute"));
- if (Cools.isEmpty(locMasts1)) {
- continue;
- }
- //7.鏌ョ湅
- locMast = locMasts1.get(0);
- }
- }
- } else {
- //涓�.姝ｅ父璐х墿鍏ュ簱
- //1.璇ュ眰鐩稿悓鐗╂枡鎽嗘斁
- //2.鑾峰緱locAttribute搴撲綅灞炴�т负1鐨勬墍鏈夊簱浣�
- //3.鏌ョ湅缁勯噷鏄惁杩樻湁绌轰綅
- locMasts = locMastService.querySame(waitPakin.getMatnr(), arr[d]);
- if (!Cools.isEmpty(locMasts)) {
- for (LocMast locMast1 : locMasts) {
- //4.鏌ョ湅璇ョ粍鏄惁鏈夐绾﹀叆搴撳拰棰勭害鍑哄簱鐨勫簱浣嶏紝鏈夌殑璇濈洿鎺ヨ烦杩囪缁�
- List<LocMast> locMasts2 = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("group1", locMast1.getGroup1())
- .in("loc_sts", "P", "Q", "R", "S"));
- if (!Cools.isEmpty(locMasts2)) {
- continue;
- }
- //5.鎵惧嚭鍚屼竴缁勭殑绌哄簱浣�
- //6.瀵规繁娴呭簱浣嶈繘琛屾帓搴�
- List<LocMast> locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("group1", locMast1.getGroup1())
- .eq("loc_sts", "O")
- .orderBy("locAttribute"));
- if (Cools.isEmpty(locMasts1)) {
- continue;
- }
- //7.鏌ョ湅
- locMast = locMasts1.get(0);
- }
- }
-
- }
- //鍥�.娌℃湁鐩稿悓鐗╂枡锛岃繘琛屾甯告壘搴�
- if (Cools.isEmpty(locMast)) {
- //鏌ユ壘璇ュ眰鎵�鏈夌┖鐨�"loc_attribute",1
- List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", arr[d])
- .eq("loc_sts", "O")
- .eq("loc_type1", 1)
- .eq("loc_attribute", 1)
- .orderBy("row1", false)
- .orderBy("bay1", false));
- if (!Cools.isEmpty(locMastList)) {
- locMast = locMastList.get(0);
- }
- }
- //璇ュ眰娌℃湁鎵惧埌搴撲綅鏃惰繘鍏ラ�掑綊鎹㈠眰鎵惧簱浣�
- if (Cools.isEmpty(locMast)) {
- ++d;
- if (d > 6) {
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
- if (d == 6 && locType == 2) {
- return getLocNo2(waitPakin, arr, 0, 1, locType1);
- }
- return getLocNo2(waitPakin, arr, d, locType, locType1);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return locMast;
}
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index c6150ae..7f50163 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -6,6 +6,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.entity.result.StorageResult;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
@@ -46,131 +47,58 @@
private LocDetlService locDetlService;
@Autowired
private BasCrnpService basCrnpService;
- @PostMapping("/pakin/loc/returnWarehouse")
- @ResponseBody
- public synchronized StorageResult returnWarehouse(@RequestBody(required = false) SearchLocParam param) {
- StorageResult storageResult=new StorageResult();
- if (Cools.isEmpty(param.getTaskNo())) {
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage("浼犲叆宸ヤ綔鍙蜂负绌�");
- return storageResult;
- }
- WrkMast wrkMast =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
- .eq("wrk_no",param.getTaskNo())
- .in("io_type",103,107));
- WrkMast wrkMast537 =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
- .eq("wrk_no",param.getTaskNo())
- .in("io_type",53,57));
- if (Cools.isEmpty(wrkMast)&&Cools.isEmpty(wrkMast537)){
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage("娌℃湁鎵惧埌鐩樼偣鎷ｆ枡浠诲姟---------"+param.getTaskNo());
- return storageResult;
- }
-
- SearchLocParam searchLocParam = new SearchLocParam();
- searchLocParam.setBoxNo(Cools.isEmpty(wrkMast)?wrkMast537.getBarcode() : wrkMast.getBarcode());
- searchLocParam.setWcsIoType(1);//婊℃澘
- searchLocParam.setWcsSourceStaNo(Cools.isEmpty(wrkMast)?wrkMast537.getSourceStaNo() : wrkMast.getStaNo());
- searchLocParam.setWcsStatus(0);
- return getLocNo(searchLocParam);
- }
@PostMapping("/pakin/loc/v1")
@ResponseBody
- public synchronized StorageResult getLocNo(@RequestBody(required = false) SearchLocParam param) {
- StorageResult storageResult=new StorageResult();
+ public synchronized R getLocNo(@RequestBody(required = false) SearchLocParam param) {
log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
- if (Cools.isEmpty(param.getWcsIoType())) {
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
- return storageResult;
+ if (Cools.isEmpty(param.getIoType())) {
+ return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
}
- if (Cools.isEmpty(param.getWcsSourceStaNo())) {
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage("婧愮珯缂栧彿涓嶈兘涓虹┖");
- return storageResult;
+ if (Cools.isEmpty(param.getSourceStaNo())) {
+ return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
- BasDevp basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",param.getWcsSourceStaNo()));
- //
- List<WrkMast> wrkMasts=wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no",param.getWcsSourceStaNo()).in("wrk_sts",11,12,13));
- if(!Cools.isEmpty(wrkMasts)){
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage("鏈夊嚭搴撲换鍔＄姝㈠叆搴�");
- basDevp.setArea("鏈夊嚭搴撲换鍔＄姝㈠叆搴�");
- basDevpService.updateById(basDevp);
- return storageResult;
- }
- int ioType = 0;
List<WaitPakin> waitPakins = null;
- if (param.getWcsIoType() == 1) {
- //鎷ｆ枡鍜岀洏鐐瑰叆搴�
- WrkMast wrkMast1037 =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
- .eq("barcode", param.getBoxNo())
- .in("io_type",103,107));
- WrkMast wrkMast537 =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
- .eq("barcode", param.getBoxNo())
- .in("io_type",53,57));
- if (wrkMast537 != null) {
- StorageResult.Results results=new StorageResult.Results();
- results.setTaskNo(wrkMast537.getWrkNo());
- results.setShelfUnitId(wrkMast537.getLocNo()+"");
- storageResult.setResults(results);
- return storageResult;
+ if (param.getIoType() == 1) {
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉＄爜涓嶈兘涓虹┖");
}
- if(Cools.isEmpty(wrkMast1037)) {
- if (Cools.isEmpty(param.getBoxNo())) {
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage("鏉＄爜涓嶈兘涓虹┖");
- basDevp.setArea("鏉＄爜涓嶈兘涓虹┖");
- basDevpService.updateById(basDevp);
- return storageResult;
+ waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ if (Cools.isEmpty(waitPakins)) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (wrkMast != null && wrkMast.getIoType() == 103) {
+ return R.parse(CodeRes.PICK_600);
}
- waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBoxNo()));
- if (Cools.isEmpty(waitPakins)) {
- WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBoxNo());
- if (wrkMast != null && wrkMast.getIoType() == 103) {
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage(CodeRes.PICK_600);
- basDevp.setArea(CodeRes.PICK_600);
- basDevpService.updateById(basDevp);
- return storageResult;
- }
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage(CodeRes.NO_COMB_700);
- basDevp.setArea(CodeRes.NO_COMB_700);
- basDevpService.updateById(basDevp);
- return storageResult;
- }
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBoxNo()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBoxNo()));
- if (countLoc > 0 || countWrk > 0) {
- storageResult.setReturnStatus(1);
- storageResult.setErrorMessage(CodeRes.EXIST_500);
- basDevp.setArea(CodeRes.NO_COMB_700);
- basDevpService.updateById(basDevp);
- return storageResult;
- }
- }else {
- ioType = wrkMast1037.getIoType();
+ return R.parse(CodeRes.NO_COMB_700);
}
-
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
+ if (countLoc > 0 || countWrk > 0) {
+ return R.error(CodeRes.EXIST_500);
+ }
+ }
+ if (Cools.isEmpty(param.getLocType1())) {
+ return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
+ LocTypeDto locTypeDto = new LocTypeDto();
+ locTypeDto.setLocType1(param.getLocType1());
- switch (param.getWcsIoType()) {
+ StartupDto dto = null;
+ switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
- storageResult = startupFullPutStore(param.getWcsSourceStaNo(), param.getBoxNo(), waitPakins,ioType);
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
break;
- case 2://绌烘墭鐩樺叆搴�
- storageResult = emptyPlateIn(param.getWcsSourceStaNo(), param.getBoxNo());
+ case 10://绌烘墭鐩樺叆搴�
+ dto = emptyPlateIn(param.getSourceStaNo(), param.getBarcode());
break;
default:
break;
}
- log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", storageResult, param.getBoxNo());
- return storageResult;
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
+ return R.ok().add(dto);
}
@@ -178,144 +106,98 @@
* 鍏ㄦ澘鍏ュ簱
*/
@Transactional
- public StorageResult startupFullPutStore(Integer devpNo, String barcode, List<WaitPakin> waitPakins,Integer ioType) {
- BasDevp basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",devpNo));
+ public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
+ // 妫�绱㈠簱浣�
+// List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
+// List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
+ WaitPakin waitPakin1 = waitPakins.get(0);
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ findLocNoAttributeVo.setMatnr(waitPakin1.getMatnr());
- StorageResult storageResult=new StorageResult();
- Integer[] arr=arr();
- LocMast locMast1=new LocMast();
- Integer workNo = 0;
- //鍒ゆ柇鏄惁鏄嫞鏂欐垨鑰呮槸鐩樼偣
- if(ioType==103||ioType==107) {
- WrkDetl wrkDetl=wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
-
- int type=Cools.isEmpty(wrkDetl.getBeBatch())?1:wrkDetl.getBeBatch();
- // 妫�绱㈠簱浣�
- WaitPakin waitPakin1=new WaitPakin();
- waitPakin1.sync(wrkDetl);
- locMast1 =commonService.getLocNo2(waitPakin1,arr,0,type,1);
- if (locMast1 == null) {
- basDevp.setArea("鏈壘鍒扮┖搴撲綅");
- basDevpService.updateById(basDevp);
- throw new CoolException("鏈壘鍒扮┖搴撲綅");
+ StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
+ if (dto == null) {
+ throw new CoolException("鎵句笉鍒扮┖搴撲綅");
+ }
+ int workNo = dto.getWorkNo();
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+ wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+ wrkMast.setIoPri(30D); // 浼樺厛绾�
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(dto.getSourceStaNo());
+ wrkMast.setStaNo(dto.getStaNo());
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ wrkMast.setModiUser(waitPakin1.getModiUser());
+ wrkMast.setAppeUser(waitPakin1.getAppeUser());
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ waitPakins.forEach(waitPakin -> {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(waitPakin);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setIoTime(wrkMast.getIoTime());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
-
- //鏇存柊璐х墿鎵�鍦ㄥ簱浣嶇殑娣辨祬鍙�
- wrkDetl.setSource(locMast1.getLocAttribute());
- wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("wrk_no", wrkDetl.getWrkNo()));
- WrkMast wrkMast=wrkMastService.selectByBarcode(barcode);
- workNo = wrkMast.getWrkNo();
- int mbz=basDevp.getDevNo()*10+Integer.valueOf(wrkMast.getSourceLocNo().substring(6));
- String ykw=wrkMast.getLocNo();
- wrkMast.setIoType(ioType-50);
- wrkMast.setWrkSts(1L);//鍏ュ簱
- wrkMast.setModiTime(new Date());
- wrkMast.setSourceStaNo(basDevp.getDevNo()); // 婧愮珯
- wrkMast.setStaNo(mbz); // 鐩爣绔�
- wrkMast.setLocNo(locMast1.getLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
- wrkMast.setSourceLocNo(ykw); // 婧愬簱浣�
-
- wrkMastService.updateById(wrkMast);
- }else{
- int type=Cools.isEmpty(waitPakins.get(0).getBeBatch())?1:waitPakins.get(0).getBeBatch();
- // 妫�绱㈠簱浣�
- locMast1 =commonService.getLocNo2(waitPakins.get(0),arr,0,type,1);
- if (locMast1 == null) {
- basDevp.setArea("鏈壘鍒扮┖搴撲綅");
- basDevpService.updateById(basDevp);
- throw new CoolException("鏈壘鍒扮┖搴撲綅");
- }
-
- int mbz=devpNo*10+Integer.valueOf(locMast1.getLocNo().substring(6));
- //姝ｅ父鍏ュ簱
- workNo = commonService.getWorkNo(0);
- Date now = new Date();
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
- wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
- wrkMast.setSourceStaNo(devpNo);
- wrkMast.setStaNo(mbz);
- wrkMast.setLocNo(locMast1.getLocNo());
- wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("Y");
- wrkMast.setCtnType(1); // 瀹瑰櫒绫诲瀷
- // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiTime(now);
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- basDevp.setArea("淇濆瓨宸ヤ綔妗ｅけ璐�");
- basDevpService.updateById(basDevp);
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 鐢熸垚宸ヤ綔妗ｆ槑缁�
- int source = locMast1.getLocAttribute();
- waitPakins.forEach(waitPakin -> {
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(waitPakin);
- wrkDetl.setWrkNo(wrkMast.getWrkNo());
- wrkDetl.setIoTime(wrkMast.getIoTime());
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiTime(now);
- wrkDetl.setSource(source);
- if (!wrkDetlService.insert(wrkDetl)) {
- basDevp.setArea("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- basDevpService.updateById(basDevp);
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
- });
- // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
- Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
- .eq("zpallet", barcode);
- WaitPakin setParam = new WaitPakin();
- setParam.setLocNo(locMast1.getLocNo());
- setParam.setIoStatus("Y");
- setParam.setModiTime(now);
- if (!waitPakinService.update(setParam, wrapper)) {
- basDevp.setArea("鏇存柊閫氱煡妗ｅけ璐�");
- basDevpService.updateById(basDevp);
- throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
- }
+ });
+ // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
+ if (!waitPakinService.updateIoStatus("Y", dto.getLocNo(), barcode)) {
+ throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
+ }
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ sourceStaNo.setWrkNo(workNo);
+ sourceStaNo.setModiTime(now);
+ if (!basDevpService.updateById(sourceStaNo)) {
+ throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.selectById(locMast1.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
- locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)){
- basDevp.setArea("鏀瑰彉搴撲綅鐘舵�佸け璐�");
- basDevpService.updateById(basDevp);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- basDevp.setArea(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
- basDevpService.updateById(basDevp);
- throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
-
- StorageResult.Results results=new StorageResult.Results();
- results.setTaskNo(workNo);
- results.setShelfUnitId(locMast1.getLocNo());
- results.setBarcode(barcode);
- storageResult.setResults(results);
- return storageResult;
+ return dto;
}
@Transactional
- public StorageResult emptyPlateIn(Integer devpNo, String barcode) {
- StorageResult storageResult=new StorageResult();
+ public StartupDto emptyPlateIn(Integer devpNo, String barcode) {
// 妫�绱㈠簱浣�
Integer[] arr=arr();
+
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ LocTypeDto locTypeDto = new LocTypeDto();
+
// 妫�绱㈠簱浣�
- LocMast locMast1 =commonService.getLocNo2(null,arr,0,1,2);
+ StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
+
+ String locNo = dto.getLocNo();
+
int workNo = commonService.getWorkNo(0);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -325,7 +207,7 @@
wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
wrkMast.setIoPri(13D); // 浼樺厛绾�
wrkMast.setSourceStaNo(devpNo);
- wrkMast.setLocNo(locMast1.getLocNo());
+ wrkMast.setLocNo(locNo);
wrkMast.setFullPlt("N"); // 婊℃澘
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
@@ -341,7 +223,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.selectById(locMast1.getLocNo());
+ LocMast locMast = locMastService.selectById(locNo);
if (locMast.getLocSts().equals("O")){
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
@@ -349,13 +231,9 @@
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(locNo + "鐩爣搴撲綅宸茶鍗犵敤");
}
- StorageResult.Results results=new StorageResult.Results();
- results.setTaskNo(workNo);
- results.setShelfUnitId(locMast1.getLocNo());
- storageResult.setResults(results);
- return storageResult;
+ return dto;
}
@Transactional
diff --git a/src/main/java/com/zy/common/web/param/SearchLocParam.java b/src/main/java/com/zy/common/web/param/SearchLocParam.java
index 63cb560..1a170ce 100644
--- a/src/main/java/com/zy/common/web/param/SearchLocParam.java
+++ b/src/main/java/com/zy/common/web/param/SearchLocParam.java
@@ -1,6 +1,5 @@
package com.zy.common.web.param;
-import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
/**
@@ -9,25 +8,13 @@
@Data
public class SearchLocParam {
- @JSONField(name = "taskNo")
- private Integer taskNo;
+ private Integer ioType;
- //鎵樼洏鐮�
- @JSONField(name = "BoxNo")
- private String boxNo;
- //鎵ц鐘舵�� 0锛氭垚鍔� 1锛氬け璐�
- @JSONField(name = "WCSStatus")
- private Integer wcsStatus=0;
- //閿欒淇℃伅 鍏蜂綋鐨勯敊璇俊鎭紙瓒呴珮锛岃秴閲嶇瓑锛�
- @JSONField(name = "WCSErrorMessage")
- private String wcsErrorMessage="";
+ private Integer sourceStaNo;
- //婧愮珯鐐�
- @JSONField(name = "WCSSourceStaNo")
- private Integer wcsSourceStaNo;
+ private String barcode;
- //绌烘澘婊℃澘 1.婊℃澘 2.绌烘澘
- @JSONField(name = "WCSIoType")
- private Integer wcsIoType;
+ // 搴撲綅瑙勬牸锛� 0:鏈煡, 1:浣庡簱浣�, 2:楂樺簱浣嶏級
+ private Short locType1;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9b3eb93..fa186db 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -51,12 +51,7 @@
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍙屾繁
- doubleDeep: true
- # 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
- # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ locGroupAsc: [[5,4,3,2,1],[7],[8],[10,11],[12],[14],[15],[17]]
#wcs瀵规帴
wcs:
@@ -65,7 +60,6 @@
URL: http://127.0.0.1:9092/wcs
#鍑哄簱绉诲簱浠诲姟涓嬪彂
outboundTaskSend: open/outboundTaskSend
-
deviceStatus : open/deviceStatus
#erp瀵规帴
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 21166f4..ba017ec 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -140,6 +140,15 @@
<include refid="stockOutCondition"></include>
</select>
+ <select id="getSameDetlList" resultType="java.lang.String">
+ SELECT ld.loc_no FROM asr_loc_detl ld
+ LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no
+ WHERE 1 = 1
+ AND ld.matnr = #{matnr}
+ AND lm.loc_sts = 'F'
+ ORDER BY ld.appe_time ASC
+ </select>
+
<select id="getStockStatis" resultType="com.zy.asrs.entity.LocDetl">
select * from
(
diff --git a/src/main/resources/mapper/WaitPakinMapper.xml b/src/main/resources/mapper/WaitPakinMapper.xml
index e4227b7..ae49a5b 100644
--- a/src/main/resources/mapper/WaitPakinMapper.xml
+++ b/src/main/resources/mapper/WaitPakinMapper.xml
@@ -49,4 +49,11 @@
<result column="memo" property="memo" />
</resultMap>
+ <update id="updateIoStatus">
+ update cust_wait_pakin
+ set io_status = #{ioStatus}
+ ,loc_no = #{locNo}
+ where zpallet = #{zpallet}
+ </update>
+
</mapper>
--
Gitblit v1.9.1