From 76c38d4e7a6e46f34f547fad873dc383c1397d00 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 24 五月 2025 14:53:09 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index 325480d..b6b4eff 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -15,7 +15,7 @@
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.enums.LocStsType;
+import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -74,7 +74,7 @@
task.setTaskStatus(TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id);
taskService.updateById(task);
- basStation.setUseStatus(StaUseStatusType.TYPE_O.type);
+ basStation.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
basStation.setBarcode(null);
basStationService.updateById(basStation);
@@ -164,8 +164,8 @@
String targetSite, String sourceSiteNo, Long loginUserId) {
Task task = new Task();
task.setTaskCode(ruleCode)
- .setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue())
- .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
+ .setTaskStatus(TaskStsType.GENERATE_IN.id)
+ .setTaskType(TaskType.TASK_TYPE_IN.type)
.setWarehType(WarehType.WAREHOUSE_TYPE_CRN.id)
.setTargLoc(targetLoc)
.setBarcode(barcode)
@@ -327,6 +327,7 @@
// locNo.setWorkNo(ruleCode);
// return locNo;
// }
+ @Override
public InTaskMsgDto getLocNo(TaskInParam param) {
String matnr = null;
String batch = null;
@@ -361,6 +362,9 @@
case "SXC": //鍥涘悜搴�
break;
case "CTU": //ctu
+ dto = getLocNoCtu(deviceBind, warehouseArea.getId(), param.getSourceStaNo(), matnr, batch, locTypeDto, 0, param.getIoType());
+ break;
+ default:
dto = getLocNoCtu(deviceBind, warehouseArea.getId(), param.getSourceStaNo(), matnr, batch, locTypeDto, 0, param.getIoType());
break;
}
@@ -488,7 +492,7 @@
if ((ioType == 1 && deviceBind.getBeSimilar().equals("1"))) {
//鐩镐技鐗╂枡鎵撳紑锛屽垽鏂繁搴撲綅鏈夋病鏈夎揣锛屾病璐у氨鏀炬繁搴撲綅锛屾湁璐у氨涓嶆搷浣�
Loc locMast2 = locService.getOne(new LambdaQueryWrapper<Loc>()
- .eq(Loc::getRow, shallowLoc)
+ .eq(Loc::getCode, shallowLoc)
.eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
.eq(Loc::getAreaId, area)
);
@@ -557,7 +561,7 @@
//鏌ヨ褰撳墠搴撲綅绫诲瀷绌哄簱浣� 灏忎簬5涓垯locmast = null
List<Loc> locTypeLocMasts = locService.list(new LambdaQueryWrapper<Loc>()
.eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
- .eq(Loc::getDeviceNo, deviceNo)
+ .eq(Loc::getChannel, deviceNo)
.eq(Loc::getType, locTypeDto.getLocType1())
.eq(Loc::getAreaId, area)
);
--
Gitblit v1.9.1