From c723475a6fb9c893c31720ed4439ac8baa027ec5 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期一, 30 三月 2026 12:33:42 +0800
Subject: [PATCH] 新增物料同步的时候判断有无库存，无则修改有则返回
---
src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
index 1c92379..43e3872 100644
--- a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
@@ -14,10 +14,12 @@
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.rcs.*;
import com.zy.asrs.mapper.AgvInfoMapper;
+import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
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;
@@ -72,6 +74,8 @@
private CommonService commonService;
@Resource
private AgvInfoMapper agvInfoMapper;
+ @Autowired
+ private LocDetlMapper locDetlMapper;
// region MES鎺ュ彛
@@ -131,6 +135,11 @@
public int synMatInfo(MesMatInfo mesMatInfo) {
try {
+ List<LocDetl> locDetls = locDetlMapper.selectList(new EntityWrapper<LocDetl>()
+ .eq("matnr", mesMatInfo.getItem_no()));
+ if (locDetls.size() > 0) {
+ return -2;
+ }
// 瑙勫垯瀹氫箟锛氶粯璁ょ3灞備负鍚屾鐨勭墿鏂欑被鍨�
long secondPath = 2;
String secondParentName = WMS_CURRENT_NAME;
@@ -273,7 +282,9 @@
// 缁堢偣涓虹┖锛岃绠楁帴椹充綅
BasStation basStation = null;
if (Cools.isEmpty(mesOutApply.getNextStationId())) {
- List<BasStation> basStations = basStationService.selectList(new EntityWrapper<BasStation>().eq("loc_sts", "O"));
+ // 1.杩炴潌绾匡紝2.铻烘潌绾�
+ int productionLine = mesOutApply.getStationId().startsWith("LL") ? 1 : 2;
+ List<BasStation> basStations = basStationService.selectList(new EntityWrapper<BasStation>().eq("loc_sts", "O").eq("area_id",productionLine));
if (basStations.isEmpty()) {
mesReturn.setSuccess("2");
mesReturn.setMessage("鏃犵┖鎺ラ┏浣嶏紝璇风◢鍚庡啀璇�!");
@@ -712,9 +723,9 @@
// 涓嬪彂缁橰CS
RcsTaskSubmit rcsTaskSubmit = new RcsTaskSubmit();
// 妯℃澘鍚�
- if(transTask.getCurStationId().startsWith("LL") || transTask.getCurStationId().startsWith("LG")) { // 璧风偣浜х嚎
+ if(transTask.getCurStationId().startsWith("LL") || transTask.getCurStationId().startsWith("LJ")|| transTask.getCurStationId().startsWith("LG") || transTask.getCurStationId().startsWith("LT")) { // 璧风偣浜х嚎
rcsTaskSubmit.setTaskType("DJ1");
- } else if(transTask.getNextStationId().startsWith("LL") || transTask.getNextStationId().startsWith("LG")) { // 缁堢偣浜х嚎
+ } else if(transTask.getNextStationId().startsWith("LL") || transTask.getNextStationId().startsWith("LJ")|| transTask.getNextStationId().startsWith("LG") || transTask.getNextStationId().startsWith("LT")) { // 缁堢偣浜х嚎
rcsTaskSubmit.setTaskType("DJ2");
}
rcsTaskSubmit.setRobotTaskCode(transTask.getTaskno());
@@ -848,7 +859,7 @@
*/
public int applyInStation(TransParent apply) {
- String url = MES_URL + (apply.getProductLineId().equals("LL") ? "AGVTransportPalletNotice" : "Aprs/AGVTransportPalletNotice");
+ String url = MES_URL + (apply.getProductLineId().equals("LL") || apply.getProductLineId().equals("LJ") ? "AGVTransportPalletNotice" : "Aprs/AGVTransportPalletNotice");
String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(apply));
if (!StringUtils.isEmpty(response) && response.contains("Success")){
MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
@@ -960,7 +971,7 @@
*/
public int outStation(TransParent apply) {
- String url = MES_URL + (apply.getProductLineId().equals("LL") ? "AGVDepartureCompleted" : "Aprs/AGVDepartureCompleted");
+ String url = MES_URL + (apply.getProductLineId().equals("LL") || apply.getProductLineId().equals("LJ") ? "AGVDepartureCompleted" : "Aprs/AGVDepartureCompleted");
String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(apply));
if (!StringUtils.isEmpty(response) && response.contains("Success")){
MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
@@ -1008,7 +1019,7 @@
stockDetl.setAnfme(locDetl.getAnfme());
stockDetls.add(stockDetl);
}
- dtLocDetailVo.setLocDetl(stockDetls);
+ dtLocDetailVo.setLocDetls(stockDetls);
dtLocDetailVoList.add(dtLocDetailVo);
}
--
Gitblit v1.9.1