From 130734fae9297d84be9ea6d50a8e8c1a7f3747ce Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 21 四月 2025 16:04:15 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java | 61 +++++++++++++++---------------
1 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
index 5e6ef92..6015e93 100644
--- a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
+++ b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
@@ -51,71 +51,70 @@
private SlaveProperties slaveProperties;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ private void execute() {
if (!enable) return;
List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>());
- if (basCrnps.isEmpty()){
+ if (basCrnps.isEmpty()) {
return;
}
Iterator<BasCrnp> iterator = basCrnps.iterator();
- while (iterator.hasNext()){
+ while (iterator.hasNext()) {
BasCrnp basCrnp = iterator.next();
- if (basCrnp.getCrnNo() == 1 && !crn1){
+ if (basCrnp.getCrnNo() == 1 && !crn1) {
iterator.remove();
}
- if (basCrnp.getCrnNo() == 2 && !crn2){
+ if (basCrnp.getCrnNo() == 2 && !crn2) {
iterator.remove();
}
- if (basCrnp.getCrnNo() == 3 && !crn3){
+ if (basCrnp.getCrnNo() == 3 && !crn3) {
iterator.remove();
}
- if (basCrnp.getCrnNo() == 4 && !crn4){
+ if (basCrnp.getCrnNo() == 4 && !crn4) {
+ iterator.remove();
+ }
+ if (basCrnp.getCrnNo() == 7) {
iterator.remove();
}
}
- if (basCrnps.isEmpty()){
+ if (basCrnps.isEmpty()) {
return;
}
- for (BasCrnp basCrnp:basCrnps){
- if (basCrnp.getCrnSts()!=3) continue;
+ for (BasCrnp basCrnp : basCrnps) {
+ if (basCrnp.getCrnSts() != 3) continue;
if (!basCrnp.getInEnable().equals("N") || !basCrnp.getOutEnable().equals("Y")) continue;
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",basCrnp.getCrnNo()).eq("io_type",11));
- if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
- LocMast locMastStart = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","D").eq("crn_no",basCrnp.getCrnNo()).orderBy("appe_time",true));//绌烘澘鎵�鍦�
- if (Cools.isEmpty(locMastStart)){
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", basCrnp.getCrnNo()).eq("io_type", 11));
+ if (Cools.isEmpty(wrkMasts) || wrkMasts.size() == 0) {
+ LocMast locMastStart = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("crn_no", basCrnp.getCrnNo()).orderBy("appe_time", true));//绌烘澘鎵�鍦�
+ if (Cools.isEmpty(locMastStart)) {
continue;
}
- if (!Utils.isShallowLoc(slaveProperties, locMastStart.getLocNo())){
+ if (Utils.isShallowLoc(slaveProperties, locMastStart.getLocNo())) {
String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMastStart.getLocNo());
LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLocNo));
- if (!locNo.getLocSts().equals("O")){
+ if (locNo != null && locNo.getLocSts().equals("D")) {
locMastStart = locNo;
}
}
LocMast locMastEnd = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_sts","O")
- .eq("crn_no",basCrnp.getCrnNo())
- .eq("loc_type1",locMastStart.getLocType1())
- .ne("modi_user",66)
- .orderBy("row1",true));//鐩爣
- if (Cools.isEmpty(locMastEnd)){
+ .eq("loc_sts", "O")
+ .eq("crn_no", basCrnp.getCrnNo())
+ //.eq("loc_type1", locMastStart.getLocType1())
+ .ne("modi_user", 77)
+ .orderBy("lev1", true));//鐩爣
+ if (Cools.isEmpty(locMastEnd)) {
continue;
}
- if (!Utils.isShallowLoc(slaveProperties, locMastEnd.getLocNo())){
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMastEnd.getLocNo());
+ if (Utils.isShallowLoc(slaveProperties, locMastEnd.getLocNo())) {
+ String shallowLocNo = Utils.getDeepLoc(slaveProperties, locMastEnd.getLocNo());
LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLocNo));
- if (locNo.getLocSts().equals("O")){
-
- }else {
- locMastEnd.setModiUser(66L);
- locMastService.updateById(locMastEnd);
- continue;
+ if (locNo != null && locNo.getModiUser() != 77L && locNo.getLocSts().equals("O")) {
+ locMastEnd = locNo;
}
}
// if (Cools.isEmpty(locMastStart) || Cools.isEmpty(locMastEnd)){
- ReturnT<String> result = locMoveAllHandler.start(locMastStart,locMastEnd,basCrnp.getCrnNo());
+ ReturnT<String> result = locMoveAllHandler.start(locMastStart, locMastEnd, basCrnp.getCrnNo());
if (!result.isSuccess()) {
log.error("澶勭悊澶辫触");
}
--
Gitblit v1.9.1