From a501d123b5e46b7c5c4bb8b4dfb7cec6cf6fdbea Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 15 五月 2025 14:06:26 +0800
Subject: [PATCH] 输送线界面写输送线任务号和目标站修复
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 98 +++++++++++++++++++++++++------------------------
1 files changed, 50 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f2d45cb..9b2c22e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -5,13 +5,12 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
-import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
-import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
@@ -34,25 +33,6 @@
@Service
public class OpenServiceImpl implements OpenService {
- @Autowired
- private TaskWrkService taskWrkService;
- @Autowired
- private SlaveProperties slaveProperties;
- @Autowired
- private ApiLogService apiLogService;
-
- @Autowired
- private StaDescService staDescService;
- @Autowired
- private CommonService commonService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private BasDevpService basDevpService;
-
-
- @Value("${wms.url}")
- private String wmsUrl;
public ArrayList<String> wharfCode1 = new ArrayList<String>() {{
add("J-1101");
add("J-1103");
@@ -63,34 +43,52 @@
add("H-1101");
add("G-1101");
}};
-
+ @Autowired
+ private TaskWrkService taskWrkService;
+ @Autowired
+ private SlaveProperties slaveProperties;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Value("${wms.url}")
+ private String wmsUrl;
@Override
public HashMap<String, Object> taskCreate(TaskCreateParam param) {
- HashMap<String,Object> map=new HashMap<>();
+ HashMap<String, Object> map = new HashMap<>();
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
if (taskWrk != null) {
- map.put("Code","0");
- map.put("Msg",param.getTaskNo()+"浠诲姟宸茬粡鐢熸垚锛�");
+ map.put("Code", "0");
+ map.put("Msg", param.getTaskNo() + "浠诲姟宸茬粡鐢熸垚锛�");
return map;
}
Date now = new Date();
taskWrk = new TaskWrk();
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getStartPoint()));
- int workNo1 = commonService.getWorkNo(WorkNoType.PAKOUT.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ if (locMast == null) {
+ map.put("Code", "0");
+ map.put("Msg", param.getStartPoint() + "搴撲綅鍙锋湁璇�");
+ return map;
+ }
+ int workNoType = WorkNoType.PAKOUT.type;
+ // 鍑哄簱鍒�2锛�3鍙峰爢鍨涙満锛岄渶瑕侀�氳繃浠诲姟鍙峰尯鍒嗗ぇ灏忔墭鐩橈紝浠诲姟鍙�3001-6000涓哄皬鎵樼洏锛屽嵆8~12鍒�
+ if (param.getIoType() == 2 && (locMast.getCrnNo() == 3 || locMast.getCrnNo() == 2) && locMast.getBay1() > 7){
+ workNoType = WorkNoType.PICK.type;
+ }
+ int workNo1 = commonService.getWorkNo(workNoType);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
- try {
- if (param.getIoType() > 1) {
- if (Utils.locNoRowBoolean(locMast.getRow1())) {
- param.setTaskPriority(11);
- }
- }
- } catch (Exception e) {
- }
+ taskWrk.setAssignTime(now);
taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
@@ -104,11 +102,11 @@
} else if (param.getIoType() == 2) {
taskWrk.setWrkSts(11);
- if (!Cools.isEmpty(param.getStartPoint())) {
+// if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(param.getStartPoint());//璧风偣
- taskWrk.setTargetPoint(param.getTargetPoint());
- }
- taskWrk.setTargetPoint(param.getTargetPoint());
+ taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint())-1));
+// }
+// taskWrk.setTargetPoint(param.getTargetPoint());
} else if (param.getIoType() == 3) {
taskWrk.setWrkSts(11);
if (!Cools.isEmpty(param.getStartPoint())) {
@@ -123,12 +121,12 @@
}
if (!taskWrkService.insert(taskWrk)) {
- map.put("Code","0");
- map.put("Msg",param.getTaskNo()+"鍒涘缓浠诲姟澶辫触锛�");
+ map.put("Code", "0");
+ map.put("Msg", param.getTaskNo() + "鍒涘缓浠诲姟澶辫触锛�");
return map;
}
- map.put("Code","1");
- map.put("Msg","ok");
+ map.put("Code", "1");
+ map.put("Msg", "ok");
return map;
}
@@ -221,7 +219,7 @@
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("stn_desc", param.getWharfCode()));
+ .eq("stn_desc", param.getStartPoint()));
if (Cools.isEmpty(staDesc)) {
throw new RuntimeException("鏈煡璇㈠埌绔欑偣淇℃伅");
}
@@ -234,7 +232,7 @@
staProtocol = staProtocol.clone();
}
Short workNo = staProtocol.getWorkNo();
- if (wharfCode1.contains(param.getWharfCode())) {
+ if (wharfCode1.contains(param.getStartPoint())) {
if (!staProtocol.isLoading() && !staProtocol.isCar() && staProtocol.getWorkNo() > 0) {
//AGV鍑哄簱瀹屾垚浠ュ悗
staProtocol.setWorkNo((short) 0);
@@ -271,11 +269,15 @@
@Override
public R getAgvPickAndPlaceV1(TaskOverParam param) {
- BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+ BasDevp basDevp = basDevpService.selectById(param.getStartPoint());
if (Cools.isEmpty(basDevp)) {
- return R.error("绔欑偣鍙锋湁璇�" + param.getStaNo());
+ return R.error("绔欑偣鍙锋湁璇�" + param.getStartPoint());
+ }
+ if (Cools.isEmpty(param.getHeight())) {
+ return R.error("楂樺害涓嶈兘涓虹┖" + param.getStartPoint());
}
if (param.getType() == 0 && basDevp.getAgvStartPick() == 1) {
+ basDevp.setInreq2(param.getHeight().toString());
return R.ok();
} else if (param.getType() == 1 && basDevp.getAgvStartPlace() == 1) {
return R.ok();
@@ -286,9 +288,9 @@
@Override
public R getAgvPickAndPlaceV2(TaskOverParam param) {
- BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+ BasDevp basDevp = basDevpService.selectById(param.getStartPoint());
if (Cools.isEmpty(basDevp)) {
- return R.error("绔欑偣鍙锋湁璇�" + param.getStaNo());
+ return R.error("绔欑偣鍙锋湁璇�" + param.getStartPoint());
}
if (param.getType() == 0) {
basDevp.setAgvTargetPick(1);
--
Gitblit v1.9.1