From 16c2b2af2ac3c9c4bc2496a171d041a48514906e Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 23 四月 2026 09:18:20 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 141a91f..1e99cbc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,9 +1,8 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.domain.param.RingThroughParam;
import com.zy.asrs.entity.BasDevpPosition;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.WcsDataSynchronizationParam;
@@ -14,7 +13,6 @@
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.SortTheExecutionOfTheCarUtil;
-import com.zy.asrs.utils.Utils;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.RgvSlave;
@@ -23,6 +21,7 @@
import com.zy.core.thread.RgvThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -45,11 +44,14 @@
@Autowired
private BasDevpPositionService basDevpPositionService;
+ @Value("${constant-parameters.perimeter}")
+ private Long perimeter;
+
@Override
@Transactional
public R wcsTaskDistribution(WcsTaskDistributionParam param) {
Date now = new Date();
- WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getTaskNo()));
+ WrkMast wrkMast1 = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("wrk_no", param.getTaskNo()));
if (!Cools.isEmpty(wrkMast1)){
return R.error("宸ヤ綔鍙峰凡瀛樺湪").add("宸ヤ綔鍙峰凡瀛樺湪锛宼askNo="+param.getTaskNo());
}
@@ -61,7 +63,7 @@
wrkMast.setIoType(1);
wrkMast.setModiTime(now);
wrkMast.setAppeTime(now);
- wrkMastService.insert(wrkMast);
+ wrkMastService.save(wrkMast);
return R.ok();
}
@@ -72,8 +74,8 @@
WcsDataSynchronizationParam wcsDataSynchronizationParam = new WcsDataSynchronizationParam();
List<WcsTaskListParam> wcsTaskListParamList = new ArrayList<>();
List<WcsRgvListParam> wcsRgvListParamList = new ArrayList<>();
- List<WrkMast> wrkMastList = wrkMastService.selectList(new EntityWrapper<>());
- List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<BasDevpPosition>().orderBy("plc_position",false));
+ List<WrkMast> wrkMastList = wrkMastService.list(new QueryWrapper<>());
+ List<BasDevpPosition> basDevpPositions = basDevpPositionService.list(new QueryWrapper<BasDevpPosition>().orderByAsc("plc_position"));
for (WrkMast wrkMast : wrkMastList){
WcsTaskListParam wcsTaskListParam = new WcsTaskListParam(wrkMast);
@@ -92,8 +94,9 @@
WcsRgvListParam wcsRgvListParam = new WcsRgvListParam();
wcsRgvListParam.setRgvNo(rgv.getId().toString());
wcsRgvListParam.setTaskNo(Cools.isEmpty(rgvProtocol.getTaskNo1()) ? null:rgvProtocol.getTaskNo1().toString());
- wcsRgvListParam.setStatus(rgvProtocol.statusType.desc);
- wcsRgvListParam.setCurrSta(SortTheExecutionOfTheCarUtil.LatelyAndLessThanWcs(basDevpPositions,rgvProtocol.getRgvPos()).toString());
+ wcsRgvListParam.setStatus(rgvProtocol.statusType.id);
+ wcsRgvListParam.setCurrPos(rgvProtocol.RgvPos);
+ wcsRgvListParam.setCurrSta(SortTheExecutionOfTheCarUtil.LatelyAndLessThanWcs(basDevpPositions,rgvProtocol.getRgvPos(),perimeter).toString());
List<String> arrayList = new ArrayList<>();
if (rgvProtocol.getAlarm()!=0){
arrayList.add(rgvProtocol.getAlarm$());
--
Gitblit v1.9.1