From dcb21dfbb8399aadfb5b2df9ba5caa0a065ea7ee Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 31 十二月 2024 11:05:15 +0800
Subject: [PATCH] 改版2.0: 1.自动出库200站 2.自动出空板100站 3.自动移库
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 18 +
src/main/java/com/zy/asrs/task/handler/AutomaticLibraryTransferHandler.java | 29 +-
src/main/resources/mapper/WrkMastMapper.xml | 2
src/main/java/com/zy/asrs/task/AutomaticLibraryTransferScheduler.java | 13 +
src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java | 151 +++++++++++++
src/main/java/com/zy/asrs/task/EmptyOutWing.java | 47 +--
src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java | 11 +
src/main/java/com/zy/common/web/WcsController.java | 6
src/main/java/com/zy/asrs/entity/LocMast.java | 2
src/main/java/com/zy/common/service/CommonService.java | 343 +++++++++++++++----------------
src/main/resources/license.lic | 0
11 files changed, 401 insertions(+), 221 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index a62b9cd..95e75e0 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -112,7 +112,7 @@
@TableField("out_enable")
private String outEnable;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍏ュ簱鏃堕棿")
@TableField("io_time")
private Date ioTime;
diff --git a/src/main/java/com/zy/asrs/task/AutomaticLibraryTransferScheduler.java b/src/main/java/com/zy/asrs/task/AutomaticLibraryTransferScheduler.java
index 74de706..04586c1 100644
--- a/src/main/java/com/zy/asrs/task/AutomaticLibraryTransferScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutomaticLibraryTransferScheduler.java
@@ -1,7 +1,9 @@
package com.zy.asrs.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.handler.AutomaticLibraryTransferHandler;
import com.zy.system.entity.Config;
@@ -18,6 +20,8 @@
private WrkMastService wrkMastService;
@Autowired
private AutomaticLibraryTransferHandler automaticLibraryTransferHandler;
+ @Autowired
+ private BasDevpService basDevpService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
@@ -29,6 +33,15 @@
if(WrkCount>0){
return;
}
+ //鑷姩鍑烘弧鎵�200
+ Config configBoundShipment = configService.selectConfigByCode("AutomaticOutboundShipment");
+ //鑷姩鍑虹┖鏉�100
+ Config configAutoEmpty = configService.selectConfigByCode("AutoEmpty");
+ BasDevp basDevp100 = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",100));
+ BasDevp basDevp200 = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",200));
+ if((configAutoEmpty.getStatus()==1&&!basDevp100.getLoading().equals("Y"))||(configBoundShipment.getStatus()==1&&!basDevp200.getLoading().equals("Y"))){
+ return;
+ }
if(config.getValue().equals("1")){
automaticLibraryTransferHandler.startOne();
}else if(config.getValue().equals("2")){
diff --git a/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java b/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java
new file mode 100644
index 0000000..2f6e818
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java
@@ -0,0 +1,151 @@
+package com.zy.asrs.task;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.StaDescService;
+import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.impl.LocDetlServiceImpl;
+import com.zy.asrs.service.impl.LocMastServiceImpl;
+import com.zy.asrs.task.handler.AutomaticLibraryTransferHandler;
+import com.zy.common.model.LocDetlDto;
+import com.zy.common.model.enums.WorkNoType;
+import com.zy.common.service.CommonService;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class AutomaticOutboundShipment {
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private AutomaticLibraryTransferHandler automaticLibraryTransferHandler;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private LocDetlServiceImpl locDetlService;
+ @Autowired
+ private LocMastServiceImpl locMastService;
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+
+ /**
+ * 鑷姩鍑烘弧鎵�
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute(){
+ Config config = configService.selectConfigByCode("AutomaticOutboundShipment");
+ if(config.getStatus()==0){
+ return;
+ }
+
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 200));
+ if (Cools.isEmpty(basDevp.getLoading())||basDevp.getLoading().equals("N")) {
+ //鎵惧埌鍏ュ簱鏈�鏃╃殑
+ LocMast locMastIoTime=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").orderBy("io_time"));
+ //鏈�鏃╁叆搴撶殑鍙兘涓嶆槸鏈�闈犺繎鍑哄簱鍙ｇ殑锛屾墍浠ラ渶瑕佸啀鍘绘壘杩欏眰鏈�闈犺繎鍑哄簱鍙ｇ殑璐�
+ LocMast locMast =locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("lev1",locMastIoTime.getLev1()).orderBy("bay1",false));
+
+ boolean res1 = false;
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("lev1", locMast.getLev1())
+ .orderBy("bay1", res1));
+ for (LocMast locMast1 : locMasts) {
+ if (locMast1.getLocNo().equals(locMast.getLocNo())) {
+ break;
+ }
+ if (locMast1.getLocSts().equals("D") || locMast1.getLocSts().equals("F")) {
+ throw new CoolException(locMast.getLocNo() + "搴撲綅鍫靛锛岀姝㈠嚭搴�");
+ }else if(!locMast1.getLocSts().equals("O")){
+ return;
+ }
+ }
+ // 鑾峰彇婧愮珯
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", 101)
+ .eq("stn_no", 200)
+ .eq("crn_no", locMast.getCrnNo());
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ throw new CoolException("妫�绱㈡簮绔欏け璐�");
+ }
+ Date now = new Date();
+
+ List<LocDetl> locDetls=locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+
+ if(Cools.isEmpty(locDetls)){
+ throw new CoolException("搴撳瓨鏄庣粏涓虹┖---locNo:"+locMast.getLocNo());
+ }
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(101));
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(0L); // 宸ヤ綔鐘舵�侊細0.寰呮帴鏀�
+ wrkMast.setIoType(101); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(15D); // 浼樺厛绾э細15
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setAppeUser(9945L); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(9945L);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+locMast.getLocNo());
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ for (LocDetl l : locDetls) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(l);
+ wrkDetl.setOrderNo(""); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAnfme(l.getAnfme()); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(9945L);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(9945L);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ }
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ locMast = locMastService.selectById(locMast.getLocNo());
+ if (locMast.getLocSts().equals("F")) {
+ locMast.setLocSts("R");
+ locMast.setModiUser(9945L);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
+ }
+ } else {
+ throw new CoolException(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
+ }
+ }
+}
diff --git a/src/main/java/com/zy/asrs/task/EmptyOutWing.java b/src/main/java/com/zy/asrs/task/EmptyOutWing.java
index 6b0ec86..a08e778 100644
--- a/src/main/java/com/zy/asrs/task/EmptyOutWing.java
+++ b/src/main/java/com/zy/asrs/task/EmptyOutWing.java
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.WrkMastService;
@@ -34,30 +36,21 @@
private CommonService commonService;
@Autowired
ConfigService configService;
+ @Autowired
+ private BasDevpService basDevpService;
-
+ /**
+ * 鑷姩鍑虹┖鏉�
+ */
@Scheduled(cron = "0/3 * * * * ? ")
private void execute() {
Config config = configService.selectConfigByCode("AutoEmpty");
- if(config.getStatus()==0){
+ if (config.getStatus() == 0) {
return;
}
- int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110));
- if (count > 0) {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("wrk_sts", 7));
- if (Cools.isEmpty(wrkMast)) {
- return;
- }
- WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 1).eq("wrk_sts", 2).eq("full_plt", "N"));
- if (Cools.isEmpty(wrkMast1)) {
- return;
- }
- wrkMast1.setFullPlt("Y");
- wrkMastService.updateById(wrkMast1);
- wrkMast.setWrkSts(14L);
- wrkMastService.updateById(wrkMast);
- } else {
- List<LocMast> locMastss =locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").orderBy("bay1"));
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 100));
+ if (Cools.isEmpty(basDevp.getLoading())||basDevp.getLoading().equals("N")) {
+ List<LocMast> locMastss = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").orderBy("bay1"));
if (Cools.isEmpty(locMastss)) {
return;
}
@@ -67,22 +60,24 @@
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locMasta.getLocNo());
if (Cools.isEmpty(locMast)) {
- throw new CoolException(locMasta.getLocNo()+"搴撲綅涓嶅瓨鍦�");
+ throw new CoolException(locMasta.getLocNo() + "搴撲綅涓嶅瓨鍦�");
}
- if (!locMast.getLocSts().equals("D")){
- throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
+ if (!locMast.getLocSts().equals("D")) {
+ throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細" + locMast.getLocNo() + " 銆佸綋鍓嶇姸鎬侊細" + locMast.getLocSts() + "-" + locMast.getLocSts$());
}
boolean res1 = true;
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("lev1", locMast.getLev1())
- .orderBy("bay1",res1));
+ .orderBy("bay1", res1));
for (LocMast locMast1 : locMasts) {
if (locMast1.getLocNo().equals(locMast.getLocNo())) {
break;
}
if (locMast1.getLocSts().equals("D") || locMast1.getLocSts().equals("F")) {
- throw new CoolException(locMasta.getLocNo()+"搴撲綅鍫靛锛岀姝㈠嚭搴�");
+ throw new CoolException(locMasta.getLocNo() + "搴撲綅鍫靛锛岀姝㈠嚭搴�");
+ }else if(!locMast1.getLocSts().equals("O")){
+ return;
}
}
// 鑾峰彇婧愮珯
@@ -102,7 +97,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(0L); // 宸ヤ綔鐘舵�侊細0.寰呭彂閫�
wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
- wrkMast.setIoPri(10D);
+ wrkMast.setIoPri(13D); //浼樺厛绾ф帓搴� 15.鍑哄簱>14.鍏ュ簱>13.绌烘澘鍑哄簱>12.绌烘澘鍏ュ簱>11.绉诲簱
wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
wrkMast.setStaNo(100); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
@@ -121,7 +116,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鏇存柊搴撲綅鐘舵�� D.绌烘澘 -> R.鍑哄簱棰勭害
- if (locMast.getLocSts().equals("D")){
+ if (locMast.getLocSts().equals("D")) {
locMast.setLocSts("R");
locMast.setModiUser(9998L);
locMast.setModiTime(now);
@@ -130,9 +125,7 @@
}
break;
}
-
}
}
-
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/AutomaticLibraryTransferHandler.java b/src/main/java/com/zy/asrs/task/handler/AutomaticLibraryTransferHandler.java
index 1d73d98..5e78226 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutomaticLibraryTransferHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutomaticLibraryTransferHandler.java
@@ -45,7 +45,6 @@
List<LocMast> locMastsO=locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts","O").eq("lev1",1).orderBy("bay1",false));
if(Cools.isEmpty(locMastsO)){
- log.info("鑷姩绉诲簱娌℃湁绌哄簱浣嶏紝璇峰叧闂嚜鍔ㄥ簱浣嶅姛鑳�");
return FAIL;
}
LocMast locMast1 = locMastsO.get(0);
@@ -136,7 +135,6 @@
List<LocMast> locMastsO=locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts","O").eq("lev1",2).orderBy("bay1",false));
if(Cools.isEmpty(locMastsO)){
- log.info("鑷姩绉诲簱娌℃湁绌哄簱浣嶏紝璇峰叧闂嚜鍔ㄥ簱浣嶅姛鑳�");
return FAIL;
}
LocMast locMast1 = locMastsO.get(0);
@@ -225,7 +223,6 @@
List<LocMast> locMastsO=locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts","O").eq("lev1",3).orderBy("bay1",true));
if(Cools.isEmpty(locMastsO)){
- log.info("鑷姩绉诲簱娌℃湁绌哄簱浣嶏紝璇峰叧闂嚜鍔ㄥ簱浣嶅姛鑳�");
return FAIL;
}
LocMast locMast1 = locMastsO.get(0);
@@ -318,21 +315,24 @@
List<LocMast> locMastsF=locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts",sts).eq("lev1",i).orderBy("bay1",boo));
List<LocMast> locMastsO=locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("loc_sts",sts).eq("lev1",i).orderBy("bay1",boo));
+ .eq("loc_sts","O").eq("lev1",i).orderBy("bay1",boo));
if(Cools.isEmpty(locMastsO)){
- log.info("鑷姩绉诲簱娌℃湁绌哄簱浣嶏紝璇峰叧闂嚜鍔ㄥ簱浣嶅姛鑳�");
- return FAIL;
+ continue;
}
LocMast locMast1 = locMastsO.get(0);
LocMast locMast2 = locMastsF.get(locMastsF.size()-1);
- if(locMast2.getBay1()>locMast1.getBay1()){
- return FAIL;
+ if(i!=3&&locMast2.getBay1()>locMast1.getBay1()){
+ continue;
+ }else if(i==3&&locMast2.getBay1()<locMast1.getBay1()){
+ continue;
}
String locNo=null;
for(LocMast locMast:locMastsF){
- if(locMast.getBay1()<locMast1.getBay1()){
+ if(i!=3&&locMast.getBay1()<locMast1.getBay1()){
+ locNo=locMast1.getLocNo();
+ }else if(i==3&&locMast.getBay1()>locMast1.getBay1()){
locNo=locMast1.getLocNo();
}
//鐢熸垚绉诲簱浠诲姟
@@ -349,10 +349,16 @@
wrkMast.setCrnNo(1);
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
- wrkMast.setFullPlt("Y"); // 婊℃澘
+ if(i!=3){
+ wrkMast.setFullPlt("Y"); // 婊℃澘
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ }else{
+ wrkMast.setFullPlt("N"); // 婊℃澘
+ wrkMast.setEmptyMk("Y"); // 绌烘澘
+ }
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
+
wrkMast.setBarcode(locMast.getBarcode()); // 鎵樼洏鐮�
wrkMast.setLinkMis("N");
wrkMast.setAppeTime(new Date());
@@ -366,6 +372,7 @@
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
for (LocDetl locDetl : locDetls) {
WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(locDetl);
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
wrkDetl.setAnfme(locDetl.getAnfme());
diff --git a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
index 3e991b0..68e69a0 100644
--- a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
@@ -55,23 +55,34 @@
task.setTaskId(wrkMast.getWrkNo().toString());
task.setBarCode(wrkMast.getBarcode());
task.setOrder(i);
+
+ //浼樺厛绾ф帓搴� 15.鍑哄簱>14.鍏ュ簱>13.绌烘澘鍑哄簱>12.绌烘澘鍏ュ簱>11.绉诲簱
if(wrkMast.getIoType() == 1 ){//鍏ュ簱
+ workIssuedResult.setPriorityCode(14);//浼樺厛绾�
task.setTaskType(0);//鍏ュ簱
task.setStartNode(inDevp);
task.setEndNode(wrkMast.getLocNo());//鐩爣搴撲綅
+
}else if(wrkMast.getIoType() == 10 ){//绌烘澘鍏ュ簱
+ workIssuedResult.setPriorityCode(12);//浼樺厛绾�
task.setTaskType(0);//鍏ュ簱
task.setStartNode("200");
task.setEndNode(wrkMast.getLocNo());//鐩爣搴撲綅
+
}else if(wrkMast.getIoType() == 101 ){//鍑哄簱
+ workIssuedResult.setPriorityCode(15);//浼樺厛绾�
task.setTaskType(1);//鍑哄簱
task.setStartNode(wrkMast.getSourceLocNo());//婧愬簱浣�
task.setEndNode(outDevp);
+
}else if(wrkMast.getIoType() == 11){//绉诲簱
+ workIssuedResult.setPriorityCode(11);//浼樺厛绾�
task.setTaskType(2);//绉诲簱
task.setStartNode(wrkMast.getSourceLocNo());//婧愬簱浣�
task.setEndNode(wrkMast.getLocNo());//鐩爣搴撲綅
+
} else {//绌烘澘鍑哄簱
+ workIssuedResult.setPriorityCode(13);//浼樺厛绾�
task.setTaskType(1);//鍑哄簱
task.setStartNode(wrkMast.getSourceLocNo());//婧愬簱浣�
task.setEndNode("100");
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index acb5fa9..52ddfb1 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -35,6 +35,8 @@
private WaitPakinService waitPakinService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private BasDevpService basDevpService;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -50,6 +52,7 @@
private ReturnT<String> doIn(WrkMast wrkMast){
Date now = new Date();
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ BasDevp basDevp = new BasDevp();
try {
if (null == locMast) {
// exceptionHandle("宸ヤ綔妗workNo={0}]搴撲綅鍙烽敊璇痆locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -74,6 +77,7 @@
return FAIL.setMsg("绌烘澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
}
+ basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",wrkMast.getSourceLocNo()));
break;
// 鍏ㄦ澘鍏ュ簱
case 1:
@@ -144,6 +148,7 @@
return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
}
+ basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",wrkMast.getSourceLocNo()));
break;
// 鎷ｆ枡鍏ュ簱
case 53:
@@ -306,6 +311,11 @@
default:
break;
}
+ if(!Cools.isEmpty(basDevp)){
+ basDevp.setLoading("N");
+ basDevp.setModiTime(now);
+ basDevpService.update(basDevp,new EntityWrapper<BasDevp>().eq("dev_no",wrkMast.getSourceLocNo()));
+ }
// 淇敼宸ヤ綔涓绘。鐘舵��
wrkMast.setWrkSts(5L);
wrkMast.setModiTime(now);
@@ -332,6 +342,13 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("宸ヤ綔妗ｅ簱浣嶅彿閿欒; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",wrkMast.getStaNo()));
+ if(Cools.isEmpty(basDevp)){
+ return FAIL.setMsg("娌℃湁鎵惧埌璇ュ嚭搴撶珯鐐�; [workNo=" + wrkMast.getWrkNo() + "],[devNo=" + wrkMast.getLocNo() + "]");
+ }
+ basDevp.setLoading("Y");
+ basDevp.setModiTime(now);
+ basDevpService.updateById(basDevp);
assert locMast != null;
switch (wrkMast.getIoType()) {
// 鍏ㄦ澘鍑哄簱
@@ -402,6 +419,7 @@
default:
break;
}
+
// 淇敼宸ヤ綔涓绘。鐘舵��
wrkMast.setWrkSts(15L);
wrkMast.setModiTime(now);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 00ae205..e3f1e21 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -53,6 +53,7 @@
/**
* 鐢熸垚宸ヤ綔鍙�
+ *
* @param wrkMk
* @return workNo(宸ヤ綔鍙�)
*/
@@ -65,17 +66,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);
}
@@ -83,7 +84,7 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (wrkMastService.selectById(workNo) != null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
@@ -92,14 +93,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);
@@ -115,34 +116,21 @@
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo( Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
- try{
+ public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
+ try {
Integer whsType = Utils.GetWhsType(sourceStaNo);
RowLastno rowLastno = rowLastnoService.selectById(whsType);
RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
/**
* 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡
*/
- switch (rowLastnoType.getType()){
- case 1:
- return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
- case 2:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
- break;
- case 3:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
- break;
+ switch (rowLastnoType.getType()) {
case 4:
- return getLocNoRun4(whsType,staDescId,sourceStaNo,matnr,batch,grade,4,locTypeDto,0);
- case 5:
- return getLocNoRun5(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
- default:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
- break;
+ return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 0);
}
- }catch (Exception e){
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
+ } catch (Exception e) {
+ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
}
return null;
}
@@ -192,27 +180,27 @@
// ===============>>>> 寮�濮嬫墽琛�
curRow = rowLastno.getCurrentRow();
- if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
crnNumber = moveCrnNo;
- if (times==0){
- curRow = moveCrnNo*4-1;
- }else {
- curRow = moveCrnNo*4-2;
+ if (times == 0) {
+ curRow = moveCrnNo * 4 - 1;
+ } else {
+ curRow = moveCrnNo * 4 - 2;
}
}
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- for (int i = times; i < crnNumber*2; i++) {
+ for (int i = times; i < crnNumber * 2; i++) {
int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
if (basCrnpService.checkSiteError(crnNo, true)) {
- rowCount = locNecessaryParameters[0];
+ rowCount = locNecessaryParameters[0];
nearRow = locNecessaryParameters[3];
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()));
- int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100));
- if (locMasts.size()-crnCountO<=2){
+ .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+ int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
+ if (locMasts.size() - crnCountO <= 2) {
times++;
continue;
}
@@ -229,9 +217,9 @@
boolean signRule2 = false;
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
- if (!Cools.isEmpty(matnr) && staDescId == 1){
+ if (!Cools.isEmpty(matnr) && staDescId == 1) {
signRule1 = true;
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
@@ -239,34 +227,34 @@
signRule2 = true;
}
- if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
+ if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
signRule1 = true;
}
}
- if (signRule1){
- if (nearRow!=curRow){
+ if (signRule1) {
+ if (nearRow != curRow) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()));
- for (LocMast locMast1:locMasts){
+ .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+ for (LocMast locMast1 : locMasts) {
//鑾峰彇宸烽亾
// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
// LocMast locMastGro = locMastService.selectById(wrkMast.getLocNo());
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){
+ LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+ 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(batch.isEmpty() ? "" : locDetl.getBatch())
&& grade.equals(grade.isEmpty() ? "" : locDetl.getBrand())) {
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+ locMast = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
break;
}
}
}
}
- }else if (signRule2){
+ } else if (signRule2) {
List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
for (String locNo : locNos) {
if (Utils.isShallowLoc(slaveProperties, locNo)) {
@@ -304,9 +292,9 @@
// }
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
- if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+ if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow).eq("whs_type",rowLastnoType.getType().longValue()));
+ .eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow).eq("whs_type", rowLastnoType.getType().longValue()));
if (!locMasts.isEmpty()) {
for (LocMast loc : locMasts) {
if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
@@ -343,17 +331,17 @@
log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
crnNo = 0;
- }else {
+ } else {
staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
crnNo = 0;
}
startupDto.setStaNo(staNo.getDevNo());
}
// 鏇存柊搴撲綅鎺掑彿
- if (Cools.isEmpty(locMast)){
+ if (Cools.isEmpty(locMast)) {
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
}
@@ -365,16 +353,16 @@
if (Cools.isEmpty(locMast) && crnNo != 0) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
- .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
- .orderBy("lev1",true).orderBy("bay1",true));
+ .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
+ .orderBy("lev1", true).orderBy("bay1", true));
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ 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").eq("whs_type",rowLastnoType.getType().longValue()));
+ .eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
if (!Cools.isEmpty(locMast2)) {
locMast = locMast2;
break;
@@ -387,27 +375,27 @@
}
}
- if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ 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").eq("whs_type",rowLastnoType.getType().longValue()));
+ .eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
if (!Cools.isEmpty(locMast2)) {
locMast = locMast2;
break;
} else {
locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "F").eq("whs_type",rowLastnoType.getType().longValue()));
+ .eq("loc_no", shallowLoc).eq("loc_sts", "F").eq("whs_type", rowLastnoType.getType().longValue()));
if (!Cools.isEmpty(locMast2)) {
locMast = locMast1;
break;
} else {
locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "D").eq("whs_type",rowLastnoType.getType().longValue()));
+ .eq("loc_no", shallowLoc).eq("loc_sts", "D").eq("whs_type", rowLastnoType.getType().longValue()));
if (!Cools.isEmpty(locMast2)) {
locMast = locMast1;
break;
@@ -431,9 +419,9 @@
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount*2) {
+ if (times < rowCount * 2) {
times = times + 1;
- return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, times);
}
// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
// if (locTypeDto.getLocType1() < 2) {
@@ -463,131 +451,131 @@
StartupDto startupDto = new StartupDto();
- if (!Cools.isEmpty(matnr) && staDescId != 10){
+ if (!Cools.isEmpty(matnr) && staDescId != 10) {
int lev = 0;
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", matnr));
- if (!Cools.isEmpty(locDetls)){
- for (LocDetl locDetl : locDetls){
- if (locMast != null){
- break;
- }
- LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
- if (Cools.isEmpty(locMast1)) {
+// List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", matnr));
+// if (!Cools.isEmpty(locDetls)){
+// for (LocDetl locDetl : locDetls){
+// if (locMast != null){
+// break;
+// }
+// LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
+// if (Cools.isEmpty(locMast1)) {
+// continue;
+// }
+// if (locMast1.getLev1() != lev && locMast1.getLev1() !=3) {
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+// .eq("lev1", locMast1.getLev1())
+// .orderBy("bay1",false));
+// if (Cools.isEmpty(locMasts)){
+// throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶆湭鐭�");
+// }
+// for (LocMast locMast2 : locMasts) {
+// if (locMast2.getLocSts().equals("O") ) {
+// if (locMast == null){
+// locMast = locMast2;
+// }
+// }else if (locMast2.getLocSts().equals("F")){
+// locMast = null;
+// }
+// }
+// }
+// }
+// if(Cools.isEmpty(locMast)){
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+// .eq("lev1", 1)
+// .orderBy("bay1",false));
+// for (LocMast locMast2 : locMasts) {
+// if (locMast2.getLocSts().equals("O") ) {
+// if (locMast == null){
+// locMast = locMast2;
+// }
+// }else if (locMast2.getLocSts().equals("F")){
+// locMast = null;
+// }
+// }
+// }
+// if(Cools.isEmpty(locMast)){
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+// .eq("lev1", 2)
+// .orderBy("bay1",false));
+// for (LocMast locMast2 : locMasts) {
+// if (locMast2.getLocSts().equals("O") ) {
+// if (locMast == null){
+// locMast = locMast2;
+// }
+// }else if (locMast2.getLocSts().equals("F")){
+// locMast = null;
+// }
+// }
+// }
+// }else {
+ for (int i = 1; i <= 2; i++) {
+ if (locMast != null) {
+ break;
+ }
+// List<LocMast> locMastsF = locMastService.selectList(new EntityWrapper<LocMast>()
+// .eq("lev1", i)
+// .eq("loc_sts", "F"));
+// if (!Cools.isEmpty(locMastsF)) {
+// continue;
+// }
+ List<LocMast> locMastsR = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("lev1", i)
+ .eq("loc_sts", "R"));
+ if (!Cools.isEmpty(locMastsR)) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("loc_no", locMastsR.get(0).getLocNo()));
+ if (Cools.isEmpty(wrkMast)) {
continue;
}
- if (locMast1.getLev1() != lev && locMast1.getLev1() !=3) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", locMast1.getLev1())
- .orderBy("bay1",false));
- if (Cools.isEmpty(locMasts)){
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶆湭鐭�");
- }
- for (LocMast locMast2 : locMasts) {
- if (locMast2.getLocSts().equals("O") ) {
- if (locMast == null){
- locMast = locMast2;
- }
- }else if (locMast2.getLocSts().equals("F")){
- locMast = null;
- }
- }
- }
- }
- if(Cools.isEmpty(locMast)){
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", 1)
- .orderBy("bay1",false));
- for (LocMast locMast2 : locMasts) {
- if (locMast2.getLocSts().equals("O") ) {
- if (locMast == null){
- locMast = locMast2;
- }
- }else if (locMast2.getLocSts().equals("F")){
- locMast = null;
- }
- }
- }
- if(Cools.isEmpty(locMast)){
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", 2)
- .orderBy("bay1",false));
- for (LocMast locMast2 : locMasts) {
- if (locMast2.getLocSts().equals("O") ) {
- if (locMast == null){
- locMast = locMast2;
- }
- }else if (locMast2.getLocSts().equals("F")){
- locMast = null;
- }
- }
- }
- }else {
- for (int i = 1; i<=2;i++){
- if (locMast != null){
- break;
- }
- List<LocMast> locMastsF = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", i)
- .eq("loc_sts","F"));
- if (!Cools.isEmpty(locMastsF)){
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (!wrkDetls.get(0).getMatnr().equals(matnr)) {
continue;
}
- List<LocMast> locMastsR = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", i)
- .eq("loc_sts","R"));
- if (!Cools.isEmpty(locMastsR)){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("loc_no", locMastsR.get(0).getLocNo()));
- if (Cools.isEmpty(wrkMast)){
- continue;
+ }
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("lev1", i)
+ .orderBy("bay1", false));
+ if (Cools.isEmpty(locMasts)) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶆湭鐭�");
+ }
+ for (LocMast locmast3 : locMasts) {
+ if (locmast3.getLocSts().equals("O")) {
+ if (locMast == null) {
+ locMast = locmast3;
}
- List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (!wrkDetls.get(0).getMatnr().equals(matnr)){
- continue;
- }
- }
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", i)
- .orderBy("bay1",false));
- if (Cools.isEmpty(locMasts)){
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶆湭鐭�");
- }
- for (LocMast locmast3 : locMasts) {
- if (locmast3.getLocSts().equals("O")){
- if (locMast == null){
- locMast = locmast3;
- }
- }else if (locmast3.getLocSts().equals("F")){
- locMast = null;
- }
+ } else if (locmast3.getLocSts().equals("F")) {
+ locMast = null;
}
}
}
- }else {
+// }
+ } else {
+ //绌烘澘鍏ュ簱
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("lev1", 3)
- .orderBy("bay1",true));
- if (Cools.isEmpty(locMasts)){
+ .orderBy("bay1", true));
+ if (Cools.isEmpty(locMasts)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶆湭鐭�");
}
for (LocMast locmast : locMasts) {
- if (locmast.getLocSts().equals("O") ) {
- if (locMast == null){
+ if (locmast.getLocSts().equals("O")) {
+ if (locMast == null) {
locMast = locmast;
}
- }else if (locmast.getLocSts().equals("D")){
+ } else if (locmast.getLocSts().equals("D")) {
locMast = null;
}
}
}
-
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount*2) {
+ if (times < rowCount * 2) {
times = times + 1;
- return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, times);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
@@ -603,6 +591,7 @@
startupDto.setLocNo(locNo);
return startupDto;
}
+
public StartupDto getLocNoRun5(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
@@ -632,12 +621,12 @@
}
int sRow = rowLastno.getsRow();
int eRow = rowLastno.geteRow();
- int crnNumber = eRow-sRow+1;
+ int crnNumber = eRow - sRow + 1;
// ===============>>>> 寮�濮嬫墽琛�
curRow = rowLastno.getCurrentRow();
- if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
crnNumber = moveCrnNo;
}
@@ -645,7 +634,7 @@
int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
- rowCount = locNecessaryParameters[0];
+ rowCount = locNecessaryParameters[0];
nearRow = locNecessaryParameters[3];
Wrapper<StaDesc> wrapper = null;
@@ -663,10 +652,10 @@
log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
crnNo = 0;
- }else {
+ } else {
staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
crnNo = 0;
}
@@ -686,16 +675,16 @@
if (Cools.isEmpty(locMast) && crnNo != 0) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
- .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
- .orderBy("lev1",true).orderBy("bay1",true));//鏈�娴呭簱浣�
+ .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
+ .orderBy("lev1", true).orderBy("bay1", true));//鏈�娴呭簱浣�
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) {
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+ if (!Cools.isEmpty(locMast2) && locMast2.getBay1() == curRow) {
locMast = locMast2;
break;
}
@@ -706,9 +695,9 @@
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount*2) {
+ if (times < rowCount * 2) {
times = times + 1;
- return getLocNoRun5(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ return getLocNoRun5(whsType, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, times);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
@@ -732,7 +721,7 @@
return msg.substring(0, 16);
} else {
StringBuilder msgBuilder = new StringBuilder(msg);
- for(int i = 0; i < count - msg.length(); ++i) {
+ for (int i = 0; i < count - msg.length(); ++i) {
msgBuilder.insert(0, "0");
}
return msgBuilder.toString();
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index c75d502..4225924 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -99,7 +99,7 @@
}
}else {
//鏈夋弧鏉垮嚭搴撴椂绂佹绌烘澘鍏ュ簱
- int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type",101).or().eq("io_type",110));
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no",200).andNew().eq("io_type",101).or().eq("io_type",110));
if(wrkCount > 0){
return Re.error("鏈夋弧鏉垮嚭搴撴椂绂佹绌烘澘鍏ュ簱");
}
@@ -350,10 +350,8 @@
// wrkMast.setWrkSts(7L);//6.鏀捐揣瀹屾垚
if(wrkMast.getIoType()==1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11){
wrkMast.setWrkSts(4L);//4.鍏ュ簱瀹屾垚
- }else if (wrkMast.getIoType()==101){
+ }else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==110){
wrkMast.setWrkSts(14L);//14.宸插嚭搴撴湭纭
- } else if (wrkMast.getIoType()==110) {
- wrkMast.setWrkSts(7L);
}
}
wrkMastService.updateById(wrkMast);
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index d3efb39..fd02b05 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index e49e71f..f205ac3 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -70,7 +70,7 @@
select * from asr_wrk_mast
where wrk_sts=5
or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
order by io_time,wrk_no asc
</select>
--
Gitblit v1.9.1