From 70e7af0ff320c7d493c0ca1d6676bed6008749df Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 18 六月 2025 13:11:39 +0800
Subject: [PATCH] #
---
/dev/null | 89 -----------------------------
src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java | 59 -------------------
2 files changed, 0 insertions(+), 148 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
index 698e864..7ec140f 100644
--- a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
@@ -1,11 +1,8 @@
package com.zy.asrs.task;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
-import com.zy.asrs.task.handler.AutoLocMoveHandler;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.properties.SlaveWmsParameterProperties;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
@@ -18,27 +15,12 @@
@Component
public class AutoLocMoveScheduler {
-
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private WorkService workService;
- @Autowired
- private AutoLocMoveHandler autoLocMoveHandler;
- @Autowired
- private BasCrnpService basCrnpService;
@Autowired
private ConfigService configService;
@Autowired
private SlaveWmsParameterProperties slaveWmsParameterProperties;
@Autowired
- private OrderService orderService;
- @Autowired
private OrderPakoutService orderPakoutService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private AutoMoveService autoMoveService;
//瀹氭椂鍑哄簱 缁忓吀鍙屼几
@Scheduled(cron = "0/3 * * * * ? ")
@@ -62,45 +44,4 @@
}
}
- //瀹氭椂鍑哄簱
- @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);
- }
- }
- }
- }
}
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
deleted file mode 100644
index d1f7212..0000000
--- a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.zy.asrs.task.handler;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.result.FindLocNoAttributeVo;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.WorkService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.model.StartupDto;
-import com.zy.common.service.CommonService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * Created by vincent on 2023/7/7
- */
-@Slf4j
-@Service
-public class AutoLocMoveHandler extends AbstractHandler<String> {
- @Autowired
- private CommonService commonService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private LocDetlService locDetlService;
- @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);
- FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(locDetl);
-
- StartupDto startupDto = commonService.getLocNo( ioType, crnNo == 1 ? 917 : 918, findLocNoAttributeVo, 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);
- FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(locDetl);
-
- StartupDto startupDto = commonService.getLocNo( ioType, crnNo == 1 ? 901 : 932, findLocNoAttributeVo, null);
- workService.locMove(locDetl.getLocNo(), startupDto.getLocNo(), 9527L);
- }
- }
- return SUCCESS;
- }
- }catch (Exception e){
- log.error("鑷姩绉诲簱鍑洪敊,鍫嗗灈鏈哄彿{}锛屽伐浣滅被鍨媨}",crnNo,ioType);
- }
- return SUCCESS;
- }
-
-}
--
Gitblit v1.9.1