From 0cac4ab2975a4dd01c937aa4f33ffa88c45b604b Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 25 十二月 2024 13:56:53 +0800
Subject: [PATCH] 更换找库位规则
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 7
src/main/java/com/zy/asrs/utils/Utils.java | 14
src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java | 120 +++---
src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java | 84 ++--
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4
src/main/resources/mapper/LocMastMapper.xml | 8
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2
src/main/java/com/zy/common/web/WcsController.java | 72 +++-
src/main/java/com/zy/asrs/service/LocMastService.java | 6
src/main/java/com/zy/common/service/CommonService.java | 684 +++++++++++++++++++++++----------------
10 files changed, 589 insertions(+), 412 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index d0d5663..8acd1e3 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -45,4 +45,6 @@
* 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 娣�<娴�
* */
LocMast selectLocByLocStsPakInO2(@Param("locNos") List<String> locNos);
+
+ LocMast selectLocByLocStsPakInF(@Param("locNos") List<String> locNos);
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index d7781a9..d6b2a2e 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -41,11 +41,7 @@
List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo);
- /*
- * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- * */
- LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos);
-
+ LocMast selectLocByLocStsPakInF(List<String> locNos);
/*
* 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
* */
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 8077398..1044064 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -47,11 +47,8 @@
*鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
* */
@Override
- public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) {
- if (curRow<nearRow){
- return this.baseMapper.selectLocByLocStsPakInF1(locNos);
- }
- return this.baseMapper.selectLocByLocStsPakInF2(locNos);
+ public LocMast selectLocByLocStsPakInF(List<String> locNos) {
+ return this.baseMapper.selectLocByLocStsPakInF(locNos);
}
/*
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 2792ee2..bc54c15 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -92,7 +92,7 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
List<String> batchs = param.getList().stream().map(FullStoreParam.MatCodeStore::getBatch).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs.get(0), batchs.get(0), null,locTypeDto);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, batchs, locTypeDto,0);
// 鐢熸垚宸ヤ綔鍙�
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
@@ -368,7 +368,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null,null,null, locTypeDto);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null,null,locTypeDto, 0);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
diff --git a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
index d90a3a3..2cbb8c9 100644
--- a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
@@ -37,67 +37,67 @@
@Autowired
private AutoMoveService autoMoveService;
- //瀹氭椂鍑哄簱 缁忓吀鍙屼几
- @Scheduled(cron = "0/3 * * * * ? ")
- public void locToLocAutoLocMove(){
- if (slaveWmsParameterProperties.isAutoLocMoveBoolean()){
- Config config = configService.selectConfigByCode("AutoLocMove");
- if (Cools.isEmpty(config) || config.getValue().equals("false")) {
- return;
- }
- Order order = orderService.selectOrderMoveStatus();
- if (!Cools.isEmpty(order)){
-// autoMoveService.selectList()
- }else {
- order = orderService.selectOrderMoveStatusInitial();
- if (Cools.isEmpty(order)){
- return;
- }
- order.setMoveStatus(2);
- orderService.updateById(order);
- }
- }
- }
+// //瀹氭椂鍑哄簱 缁忓吀鍙屼几
+// @Scheduled(cron = "0/3 * * * * ? ")
+// public void locToLocAutoLocMove(){
+// if (slaveWmsParameterProperties.isAutoLocMoveBoolean()){
+// Config config = configService.selectConfigByCode("AutoLocMove");
+// if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+// return;
+// }
+// Order order = orderService.selectOrderMoveStatus();
+// if (!Cools.isEmpty(order)){
+//// autoMoveService.selectList()
+// }else {
+// order = orderService.selectOrderMoveStatusInitial();
+// if (Cools.isEmpty(order)){
+// return;
+// }
+// order.setMoveStatus(2);
+// orderService.updateById(order);
+// }
+// }
+// }
//瀹氭椂鍑哄簱
- @Scheduled(cron = "0/3 * * * * ? ")
- public void locToLoc11(){
- if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
- Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
- if (Cools.isEmpty(config) || config.getValue().equals("false")) {
- return;
- }
- int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
- for (int crnNo = 1;crnNo < crnCount;crnNo++){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
- WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
- if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)){
- autoLocMoveHandler.start(crnNo,11);
- }
- }
- }
- }
+// @Scheduled(cron = "0/3 * * * * ? ")
+// public void locToLoc11(){
+// if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
+// Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
+// if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+// return;
+// }
+// int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
+// for (int crnNo = 1;crnNo < crnCount;crnNo++){
+// WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
+// WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
+// if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)){
+// autoLocMoveHandler.start(crnNo,11);
+// }
+// }
+// }
+// }
- //瀹氭椂鍏ュ簱
- @Scheduled(cron = "0/3 * * * * ? ")
- public void locToLoc111() {
- if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
- Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
- if (Cools.isEmpty(config) || config.getValue().equals("false")) {
- return;
- }
- int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
- for (int crnNo = 1;crnNo < crnCount;crnNo++){
- BasCrnp basCrnp = basCrnpService.selectById(crnNo);
- if (basCrnp == null) {
- continue;
- }
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
- WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
- if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)){
- autoLocMoveHandler.start(crnNo,111);
- }
- }
- }
- }
+// //瀹氭椂鍏ュ簱
+// @Scheduled(cron = "0/3 * * * * ? ")
+// public void locToLoc111() {
+// if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
+// Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
+// if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+// return;
+// }
+// int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
+// for (int crnNo = 1;crnNo < crnCount;crnNo++){
+// BasCrnp basCrnp = basCrnpService.selectById(crnNo);
+// if (basCrnp == null) {
+// continue;
+// }
+// WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
+// WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
+// if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)){
+// autoLocMoveHandler.start(crnNo,111);
+// }
+// }
+// }
+// }
}
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
index a31b438..178acec 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
@@ -36,47 +36,47 @@
@Autowired
private WorkService workService;
- @Transactional(isolation = Isolation.REPEATABLE_READ)
- public ReturnT<String> start(Integer crnNo, Integer ioType) {
- try {
- //11 绌挎绉诲崟杈�
- if (ioType==11){
- for (int bay = 1;bay < 27;bay++){
- for (int lev = 1 ; lev <6 ; lev++){
- List<LocMast> locMasts = locMastService.selectLocMastShuttleMoveUnilateral(bay,lev,crnNo);
- if (!Cools.isEmpty(locMasts) && locMasts.size()<4){
- for (LocMast locMast:locMasts){
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
- StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 6 : 5, ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(), null);
- workService.locMove(locMast.getLocNo(), startupDto.getLocNo(),9527L);
- }
- return SUCCESS;
- }
- }
- }
- }else {//11 鍗曡竟绉荤┛姊�
- List<Map<String, Object>> list = locDetlService.selectLocDetlUnilateralMoveShuttleMap(crnNo);//111 鍗曡竟绉荤┛姊�
- for (Map<String, Object> map : list) {
- String matnr = map.getOrDefault("matnr","").toString();//鐗╂枡鍙�
- String batch = map.getOrDefault("batch","").toString();//鎵瑰彿
- String grade = map.getOrDefault("brand","").toString();//绛夌骇
- int count = Integer.parseInt(map.get("count").toString());//鍗曡竟搴撴暟閲�
- if (count < 4) {
- continue;
- }
-
- List<LocDetl> locDetlList = locDetlService.selectLocDetlUnilateralMoveShuttle(matnr, batch, grade, crnNo);
- for (LocDetl locDetl : locDetlList) {
- StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 4 : 3, ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null);
- workService.locMove(locDetl.getLocNo(), startupDto.getLocNo(), 9527L);
- }
- }
- return SUCCESS;
- }
- }catch (Exception e){
- log.error("鑷姩绉诲簱鍑洪敊,鍫嗗灈鏈哄彿{}锛屽伐浣滅被鍨媨}",crnNo,ioType);
- }
- return SUCCESS;
- }
+// @Transactional(isolation = Isolation.REPEATABLE_READ)
+// public ReturnT<String> start(Integer crnNo, Integer ioType) {
+// try {
+// //11 绌挎绉诲崟杈�
+// if (ioType==11){
+// for (int bay = 1;bay < 27;bay++){
+// for (int lev = 1 ; lev <6 ; lev++){
+// List<LocMast> locMasts = locMastService.selectLocMastShuttleMoveUnilateral(bay,lev,crnNo);
+// if (!Cools.isEmpty(locMasts) && locMasts.size()<4){
+// for (LocMast locMast:locMasts){
+// LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+// StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 6 : 5, ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(), null);
+// workService.locMove(locMast.getLocNo(), startupDto.getLocNo(),9527L);
+// }
+// return SUCCESS;
+// }
+// }
+// }
+// }else {//11 鍗曡竟绉荤┛姊�
+// List<Map<String, Object>> list = locDetlService.selectLocDetlUnilateralMoveShuttleMap(crnNo);//111 鍗曡竟绉荤┛姊�
+// for (Map<String, Object> map : list) {
+// String matnr = map.getOrDefault("matnr","").toString();//鐗╂枡鍙�
+// String batch = map.getOrDefault("batch","").toString();//鎵瑰彿
+// String grade = map.getOrDefault("brand","").toString();//绛夌骇
+// int count = Integer.parseInt(map.get("count").toString());//鍗曡竟搴撴暟閲�
+// if (count < 4) {
+// continue;
+// }
+//
+// List<LocDetl> locDetlList = locDetlService.selectLocDetlUnilateralMoveShuttle(matnr, batch, grade, crnNo);
+// for (LocDetl locDetl : locDetlList) {
+// StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 4 : 3, ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null);
+// workService.locMove(locDetl.getLocNo(), startupDto.getLocNo(), 9527L);
+// }
+// }
+// return SUCCESS;
+// }
+// }catch (Exception e){
+// log.error("鑷姩绉诲簱鍑洪敊,鍫嗗灈鏈哄彿{}锛屽伐浣滅被鍨媨}",crnNo,ioType);
+// }
+// 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 796c42c..69af95a 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -560,4 +560,18 @@
return result;
}
+ // 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
+ public static List<String> getGroupOutsideLocCrn(String locNo){
+ int row = getRow(locNo);
+ List<String> result = new ArrayList<>();
+ if (row==3 || row == 4){
+ result.add(zerofill(String.valueOf(3), 2) + locNo.substring(2));
+ result.add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
+ return result;
+ }else{
+ result.add(locNo);
+ return result;
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index edcfa78..1082805 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -26,6 +26,8 @@
import java.util.ArrayList;
import java.util.List;
+import static com.zy.asrs.utils.Utils.zerofill;
+
/**
* 璐ф灦鏍稿績鍔熻兘
* Created by vincent on 2020/6/11
@@ -55,6 +57,7 @@
/**
* 鐢熸垚宸ヤ綔鍙�
+ *
* @param wrkMk
* @return workNo(宸ヤ綔鍙�)
*/
@@ -67,17 +70,17 @@
int workNo = wrkLastno.getWrkNo();
int sNo = wrkLastno.getSNo();
int eNo = wrkLastno.getENo();
- workNo = workNo>=eNo ? sNo : workNo+1;
+ workNo = workNo >= eNo ? sNo : workNo + 1;
while (true) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
if (null != wrkMast) {
- workNo = workNo>=eNo ? sNo : workNo+1;
+ workNo = workNo >= eNo ? sNo : workNo + 1;
} else {
break;
}
}
// 淇敼搴忓彿璁板綍
- if (workNo > 0){
+ if (workNo > 0) {
wrkLastno.setWrkNo(workNo);
wrkLastnoService.updateById(wrkLastno);
}
@@ -85,7 +88,7 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (wrkMastService.selectById(workNo) != null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
@@ -94,14 +97,14 @@
//鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
@Transactional
- public StartupDto getScanBarcodeEmptyBoard(){
+ public StartupDto getScanBarcodeEmptyBoard() {
StartupDto startupDto = new StartupDto();
Integer staNo = 0;
- if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216))<2){
- staNo=216;
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216)) < 2) {
+ staNo = 216;
}
- if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220))<2){
- staNo=220;
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220)) < 2) {
+ staNo = 220;
}
startupDto.setStaNo(staNo);
@@ -114,187 +117,84 @@
* @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
* @param staDescId 璺緞ID
* @param sourceStaNo 婧愮珯
- * @param matnr 鐗╂枡鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
- try{
- whsType = Utils.GetWhsType(sourceStaNo);
- }catch (Exception e){
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
- return null;
- }
- return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
- }
-
- /**
- * 妫�绱㈠簱浣嶅彿
- *
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞ID
- * @param sourceStaNo 婧愮珯
- * @param matnr 鐗╂枡鍙烽泦鍚�
- * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
- */
- @Transactional
- public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
- if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
- matnr = "";
- }
- if (Cools.isEmpty(batch)) { //鎵规
- batch = "";
- }
- if (Cools.isEmpty(grade)) { //澶囩敤
- grade = "";
- }
-
- // 鍒濆鍖栧弬鏁�
- int crnNo = 0; //鍫嗗灈鏈哄彿
- int nearRow = 0; //鏈�娴呭簱浣嶆帓
- int curRow = 0; //鏈�娣卞簱浣嶆帓
- int rowCount = 0; //杞杞
- LocMast locMast = null; // 鐩爣搴撲綅
-
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, List<String> batchs, LocTypeDto locTypeDto, int times) {
+ // 鐩爣鍫嗗灈鏈哄彿
StartupDto startupDto = new StartupDto();
RowLastno rowLastno = rowLastnoService.selectById(whsType);
- int sRow = rowLastno.getsRow();
- int eRow = rowLastno.geteRow();
- int crnNumber = rowLastno.getCrnQty();
-
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
- // ===============>>>> 寮�濮嬫墽琛�
- curRow = rowLastno.getCurrentRow();
+ // 鐩爣搴撲綅
+ LocMast locMast = null;
- if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
- crnNumber = moveCrnNo;
- if (times==0){
- curRow = moveCrnNo*4-1;
- }else {
- curRow = moveCrnNo*4-2;
- }
- }
- //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- for (int i = times; i < crnNumber*2; i++) {
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(whsType, curRow, crnNumber);
- curRow = locNecessaryParameters[1];
- crnNo = locNecessaryParameters[2];
- if (basCrnpService.checkSiteError(crnNo, true)) {
- rowCount = locNecessaryParameters[0];
- nearRow = locNecessaryParameters[3];
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
- int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100));
- if (locMasts.size()-crnCountO<=2){
- times++;
- continue;
+ for (int i = 0; i < 4; i++) {
+ //鎵惧簱浣嶆寜鍫嗗灈鏈哄彿鏉ユ壘锛屼粠涓嬪線涓婏紝浠庡墠寰�鍚庯紝浠庡乏鍒板彸
+ List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("crn_no", whsType)
+ .eq("loc_sts", "O")
+ .orderBy("lev1")
+ .orderBy("bay1")
+ .orderBy("row1"));
+ BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
+ .eq("crn_no", whsType));
+ if (locMastList.size() < 5 || crn_no.getInEnable().equals("N") || crn_no.getCrnSts() != 1) {
+ if (whsType == 4) {
+ whsType = 1;
+ } else {
+ whsType++;
}
- break;
- } else {
- times++;
+ i++;
+ continue;
}
- }
- if (nearRow == 0) {
- throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
- }
-
- boolean signRule1 = false;
- boolean signRule2 = false;
-
-
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
- if (!Cools.isEmpty(matnr) && staDescId == 1){
- signRule1 = true;
- }
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
- if (!Cools.isEmpty(matnr) && staDescId == 1) {
- signRule2 = true;
- }
-
- if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
- signRule1 = true;
- }
- }
-
- if (signRule1){
- if (nearRow!=curRow){
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").orderBy("lev1"));
- for (LocMast locMast1:locMasts){
- //鑾峰彇宸烽亾
- List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow<nearRow);
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,groupOutsideLocCrn);
- if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
-// if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr()) && batch.equals(Cools.isEmpty(locDetl.getBatch()) ? "" : locDetl.getBatch()) && grade.equals(Cools.isEmpty(locDetl.getBrand()) ? "" : locDetl.getBrand())) {
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,groupOutsideLocCrn);
- break;
-// }
- }
- }
- }
- }else if (signRule2){
- List<String> locNos = locDetlService.getSameDetlToday(matnr, 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.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- locMast = shallowLoc;
- crnNo = locMast.getCrnNo();
- break;
- }
- }
- }
- }
- }
-
-// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗�
-// if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) {
-// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
-// for (LocMast locMast1:locMasts){
-// if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
-// continue;
-// }
-// String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
-// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",shallowLoc));
-// if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("D")){
-// locMast = locMast1;
-// break;
-// }
-// }
-// }
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
- if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
- if (!locMasts.isEmpty()) {
- for (LocMast loc : locMasts) {
- if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
+ for (LocMast locMast1 : locMastList) {
+ //鍒ゆ柇搴撲綅鏄惁涓�3鐨勬祬搴撲綅锛屽鏋滄槸鏌ョ湅鍏舵繁搴撲綅鏄惁涓虹┖
+ if (locMast1.getRow1() % 4 == 3) {
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("lev1", locMast1.getLev1())
+ .eq("bay1", locMast1.getBay1())
+ .eq("row1", locMast1.getRow1() + 1)
+ );
+ if (locMast2.getLocSts().equals("O")) {
+ locMast = locMast2;
+ break;
+ } else if (locMast2.getLocSts().equals("F")) {
+ locMast = locMast1;
+ break;
+ } else {
continue;
}
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- locMast = shallowLoc;
- crnNo = locMast.getCrnNo();
- break;
- }
- }
+
+ } else if (locMast1.getRow1() % 4 == 2) {
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("lev1", locMast1.getLev1())
+ .eq("bay1", locMast1.getBay1())
+ .eq("row1", locMast1.getRow1() - 1)
+ );
+ if (locMast2.getLocSts().equals("F")) {
+ locMast = locMast1;
+ break;
+ } else {
+ continue;
}
+ } else {
+ locMast = locMast1;
+ break;
}
+ }
+ if (Cools.isEmpty(locMast)) {
+ if (whsType == 4) {
+ whsType = 1;
+ } else {
+ whsType++;
+ }
+ i++;
+ }
+ if (!Cools.isEmpty(locMast)) {
+ break;
}
}
@@ -302,115 +202,46 @@
StaDesc staDesc = null;
BasDevp staNo = null;
- if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
- // 鑾峰彇鐩爣绔�
- wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
- staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
-// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- crnNo = 0;
- }else {
- staNo = basDevpService.selectById(staDesc.getCrnStn());
- if (!staNo.getAutoing().equals("Y")) {
- log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
-// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
- crnNo = 0;
- }
- startupDto.setStaNo(staNo.getDevNo());
- }
- // 鏇存柊搴撲綅鎺掑彿
- if (Cools.isEmpty(locMast)){
- rowLastno.setCurrentRow(curRow);
- rowLastnoService.updateById(rowLastno);
- }
+ // 鑾峰彇鐩爣绔�
+ wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", whsType);
+ staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, whsType);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+ staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+ throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
}
- // 寮�濮嬫煡鎵惧簱浣� ==============================>>
- // 1.鎸夎鍒欐煡鎵惧簱浣�
- if (Cools.isEmpty(locMast) && crnNo != 0) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow)
- .eq("loc_sts", "O")
- .orderBy("lev1",true).orderBy("bay1",true));
- for (LocMast locMast1 : locMasts) {
- if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
- continue;
- }
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
- String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "O"));
- if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
- break;
- }
- } else {
- if (!Cools.isEmpty(locMast1)) {
- locMast = locMast1;
- break;
- }
- }
- }
-
- if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)){
- for (LocMast locMast1 : locMasts) {
- if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
- continue;
- }
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
- String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "O"));
- if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
- break;
- } else {
- locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "F"));
- if (!Cools.isEmpty(locMast2)) {
- locMast = locMast1;
- break;
- } else {
- locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "D"));
- if (!Cools.isEmpty(locMast2)) {
- locMast = locMast1;
- break;
- }
- }
- }
- } else {
- if (!Cools.isEmpty(locMast1)) {
- locMast = locMast1;
- break;
- }
- }
- }
- }
- }
-
- if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
- locMast = null;
- }
-
- // 閫掑綊鏌ヨ
+ // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount*2) {
+ if (times < 4) {
times = times + 1;
- return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ return getLocNo(1, staDescId, sourceStaNo, matNos, batchs, locTypeDto, times);
}
-// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
-// if (locTypeDto.getLocType1() < 2) {
-// int i = locTypeDto.getLocType1() + 1;
-// locTypeDto.setLocType1((short)i);
-// return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
-// }
+ //1==>3==>4==>2
+ // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
+ if (locTypeDto.getLocType1() != 2) {
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿},寮�濮嬫煡璇㈤噸搴撲綅浠�", JSON.toJSONString(locTypeDto), times);
+ int i = 0;
+ if (locTypeDto.getLocType1() == 1) {
+ i = 3;
+ } else if (locTypeDto.getLocType1() == 3) {
+ i = locTypeDto.getLocType1() + 1;
+ } else if (locTypeDto.getLocType1() == 4) {
+ i = 2;
+ }
+
+ locTypeDto.setLocType1((short) i);
+ times = 1;
+ return getLocNo(1, staDescId, sourceStaNo, matNos, batchs, locTypeDto, times);
+ }
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
}
@@ -420,9 +251,308 @@
int workNo = getWorkNo(0);
// 杩斿洖dto
startupDto.setWorkNo(workNo);
- startupDto.setCrnNo(crnNo);
+ startupDto.setCrnNo(whsType);
startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locNo);
return startupDto;
}
+
+// /**
+// * 妫�绱㈠簱浣嶅彿
+// *
+// * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+// * @param staDescId 璺緞ID
+// * @param sourceStaNo 婧愮珯
+// * @param matnr 鐗╂枡鍙烽泦鍚�
+// * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+// */
+// @Transactional
+// public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+// if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
+// matnr = "";
+// }
+// if (Cools.isEmpty(batch)) { //鎵规
+// batch = "";
+// }
+// if (Cools.isEmpty(grade)) { //澶囩敤
+// grade = "";
+// }
+//
+// // 鍒濆鍖栧弬鏁�
+// int crnNo = 0; //鍫嗗灈鏈哄彿
+// int nearRow = 0; //鏈�娴呭簱浣嶆帓
+// int curRow = 0; //鏈�娣卞簱浣嶆帓
+// int rowCount = 0; //杞杞
+// LocMast locMast = null; // 鐩爣搴撲綅
+//
+// StartupDto startupDto = new StartupDto();
+// RowLastno rowLastno = rowLastnoService.selectById(whsType);
+// int sRow = rowLastno.getsRow();
+// int eRow = rowLastno.geteRow();
+// int crnNumber = rowLastno.getCrnQty();
+//
+// if (Cools.isEmpty(rowLastno)) {
+// throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+// }
+// // ===============>>>> 寮�濮嬫墽琛�
+// curRow = rowLastno.getCurrentRow();
+//
+// if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+// crnNumber = moveCrnNo;
+// if (times==0){
+// curRow = moveCrnNo*4-1;
+// }else {
+// curRow = moveCrnNo*4-2;
+// }
+// }
+//
+// //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
+// for (int i = times; i < crnNumber*2; i++) {
+// int[] locNecessaryParameters = Utils.LocNecessaryParameters(whsType, curRow, crnNumber);
+// curRow = locNecessaryParameters[1];
+// crnNo = locNecessaryParameters[2];
+// if (basCrnpService.checkSiteError(crnNo, true)) {
+// rowCount = locNecessaryParameters[0];
+// nearRow = locNecessaryParameters[3];
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+// int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100));
+// if (locMasts.size()-crnCountO<=2){
+// times++;
+// continue;
+// }
+// break;
+// } else {
+// times++;
+// }
+// }
+// if (nearRow == 0) {
+// throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+// }
+//
+// boolean signRule1 = false;
+// boolean signRule2 = false;
+//
+//
+// if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+// // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
+// if (!Cools.isEmpty(matnr) && staDescId == 1){
+// signRule1 = true;
+// }
+// // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
+// if (!Cools.isEmpty(matnr) && staDescId == 1) {
+// signRule2 = true;
+// }
+//
+// if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
+// signRule1 = true;
+// }
+// }
+//
+// if (signRule1){
+// if (nearRow!=curRow){
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").orderBy("lev1"));
+// for (LocMast locMast1:locMasts){
+// //鑾峰彇宸烽亾
+// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow<nearRow);
+// //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+// LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,groupOutsideLocCrn);
+// if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){
+// LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
+//// if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr()) && batch.equals(Cools.isEmpty(locDetl.getBatch()) ? "" : locDetl.getBatch()) && grade.equals(Cools.isEmpty(locDetl.getBrand()) ? "" : locDetl.getBrand())) {
+// //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+// locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,groupOutsideLocCrn);
+// break;
+//// }
+// }
+// }
+// }
+// }else if (signRule2){
+// List<String> locNos = locDetlService.getSameDetlToday(matnr, 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.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
+// if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+// locMast = shallowLoc;
+// crnNo = locMast.getCrnNo();
+// break;
+// }
+// }
+// }
+// }
+// }
+//
+//// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗�
+//// if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) {
+//// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+//// for (LocMast locMast1:locMasts){
+//// if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+//// continue;
+//// }
+//// String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
+//// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",shallowLoc));
+//// if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("D")){
+//// locMast = locMast1;
+//// break;
+//// }
+//// }
+//// }
+//
+// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
+// if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+// if (!locMasts.isEmpty()) {
+// 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 (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
+// if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+// locMast = shallowLoc;
+// crnNo = locMast.getCrnNo();
+// break;
+// }
+// }
+// }
+// }
+// }
+// }
+//
+// Wrapper<StaDesc> wrapper = null;
+// StaDesc staDesc = null;
+// BasDevp staNo = null;
+//
+// if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
+// // 鑾峰彇鐩爣绔�
+// wrapper = new EntityWrapper<StaDesc>()
+// .eq("type_no", staDescId)
+// .eq("stn_no", sourceStaNo)
+// .eq("crn_no", crnNo);
+// staDesc = staDescService.selectOne(wrapper);
+// if (Cools.isEmpty(staDesc)) {
+// log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+//// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+// crnNo = 0;
+// }else {
+// staNo = basDevpService.selectById(staDesc.getCrnStn());
+// if (!staNo.getAutoing().equals("Y")) {
+// log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+//// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+// crnNo = 0;
+// }
+// startupDto.setStaNo(staNo.getDevNo());
+// }
+// // 鏇存柊搴撲綅鎺掑彿
+// if (Cools.isEmpty(locMast)){
+// rowLastno.setCurrentRow(curRow);
+// rowLastnoService.updateById(rowLastno);
+// }
+// }
+//
+// // 寮�濮嬫煡鎵惧簱浣� ==============================>>
+//
+// // 1.鎸夎鍒欐煡鎵惧簱浣�
+// if (Cools.isEmpty(locMast) && crnNo != 0) {
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+// .eq("row1", nearRow)
+// .eq("loc_sts", "O")
+// .orderBy("lev1",true).orderBy("bay1",true));
+// for (LocMast locMast1 : locMasts) {
+// if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+// continue;
+// }
+// if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+// String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+// .eq("loc_no", shallowLoc).eq("loc_sts", "O"));
+// if (!Cools.isEmpty(locMast2)) {
+// locMast = locMast2;
+// break;
+// }
+// } else {
+// if (!Cools.isEmpty(locMast1)) {
+// locMast = locMast1;
+// break;
+// }
+// }
+// }
+//
+// if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)){
+// for (LocMast locMast1 : locMasts) {
+// if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+// continue;
+// }
+// if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+// String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+// .eq("loc_no", shallowLoc).eq("loc_sts", "O"));
+// if (!Cools.isEmpty(locMast2)) {
+// locMast = locMast2;
+// break;
+// } else {
+// locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+// .eq("loc_no", shallowLoc).eq("loc_sts", "F"));
+// if (!Cools.isEmpty(locMast2)) {
+// locMast = locMast1;
+// break;
+// } else {
+// locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+// .eq("loc_no", shallowLoc).eq("loc_sts", "D"));
+// if (!Cools.isEmpty(locMast2)) {
+// locMast = locMast1;
+// break;
+// }
+// }
+// }
+// } else {
+// if (!Cools.isEmpty(locMast1)) {
+// locMast = locMast1;
+// break;
+// }
+// }
+// }
+// }
+// }
+//
+// if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
+// locMast = null;
+// }
+//
+// // 閫掑綊鏌ヨ
+// if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
+// // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
+// if (times < rowCount*2) {
+// times = times + 1;
+// return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+// }
+//// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+//// if (locTypeDto.getLocType1() < 2) {
+//// int i = locTypeDto.getLocType1() + 1;
+//// locTypeDto.setLocType1((short)i);
+//// return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
+//// }
+// 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.setLocNo(locNo);
+// return startupDto;
+// }
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 23e9156..95a51ed 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -44,11 +44,13 @@
@Autowired
private WaitPakinService waitPakinService;
@Autowired
- private LocDetlService locDetlService;
+ private LocDetlService locDetlService;
@Autowired
private RowLastnoService rowLastnoService;
@Autowired
private WorkService workService;
+ @Autowired
+ private BasCrnpService basCrnpService;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -73,13 +75,13 @@
}
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()));
+ 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())){
+ if (Cools.isEmpty(param.getLocType1())) {
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
@@ -106,12 +108,12 @@
@PostMapping("/auto/emptyIn/v1")
@ResponseBody
- public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto){
+ public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null,null,null, locTypeDto);
+ StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null, null, locTypeDto, 0);
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -134,12 +136,12 @@
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
wrkMast.setMemo("鑷姩绌烘墭鍏ュ簱");
- return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
+ return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
}
@PostMapping("auto/emptyOut/v1")
@ResponseBody
- public R autoEmptyOut(){
+ public R autoEmptyOut() {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_sts", "D"));
if (Cools.isEmpty(locMast)) {
@@ -147,9 +149,11 @@
}
EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
emptyPlateOutParam.setOutSite(12);
- emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
+ emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
+ add(locMast.getLocNo() + "");
+ }});
WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
- return R.ok(!Cools.isEmpty(wrkMast)? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
+ return R.ok(!Cools.isEmpty(wrkMast) ? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
}
/**
@@ -162,7 +166,20 @@
// 妫�绱㈠簱浣�
List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto);
+ int rowCount = rowLastnoService.selectCount(null);
+ Integer integer = 1;
+ for (int i = 1; i <= rowCount; i++) {
+ integer = rowLastnoService.selectNextWhsType();
+ BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
+ .eq("crn_no", integer));
+ List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("crn_no", integer)
+ .eq("loc_sts", "O"));
+ if (locMastList.size() >= 5 && crn_no.getInEnable().equals("Y") && crn_no.getCrnSts() == 1) {
+ break;
+ }
+ }
+ StartupDto dto = commonService.getLocNo(integer, 1, devpNo, matnrs, batchs, locTypeDto, 0);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -215,19 +232,19 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(now);
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto;
}
@@ -236,8 +253,21 @@
public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
- // 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null, locTypeDto);
+ int rowCount = rowLastnoService.selectCount(null);
+ Integer integer = 1;
+ for (int i = 1; i <= rowCount; i++) {
+ integer = rowLastnoService.selectNextWhsType();
+ BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
+ .eq("crn_no", integer));
+ List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("crn_no", integer)
+ .eq("loc_sts", "O"));
+ if (locMastList.size() >= 5 && crn_no.getInEnable().equals("Y") && crn_no.getCrnSts() == 1) {
+ break;
+ }
+ }
+
+ StartupDto dto = commonService.getLocNo(integer, 1, devpNo, null, null, locTypeDto, 0);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -267,19 +297,19 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(new Date());
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto;
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 4c06268..a74039a 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -116,4 +116,12 @@
AND loc_sts in ('O') order by row1 ,lev1
</select>
+ <select id="selectLocByLocStsPakInF" resultMap="BaseResultMap">
+ SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE loc_no in
+ <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
+ #{locNo}
+ </foreach>
+ AND loc_sts not in ('O') order by row1 DESC
+ </select>
+
</mapper>
--
Gitblit v1.9.1