From 48ebc3e1120c4d72ea490167b9705208edc79071 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 20 四月 2026 12:03:58 +0800
Subject: [PATCH] dj修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 96611bd..77f3c44 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
@@ -1019,7 +1019,8 @@
if (Objects.isNull(task)) {
log.error("浠诲姟涓嶅瓨鍦ㄦ垨宸茬粨鏉燂紒浠诲姟缂栧彿锛歿}锛屾壒娆″彿锛歿}", taskNo, taskCode);
- throw new CoolException("浠诲姟涓嶅瓨鍦ㄦ垨宸茬粨鏉燂紒锛佷换鍔＄紪鍙凤細" + taskNo + "锛屾壒娆″彿锛�" + taskCode);
+ // throw new CoolException("浠诲姟涓嶅瓨鍦ㄦ垨宸茬粨鏉燂紒锛佷换鍔＄紪鍙凤細" + taskNo + "锛屾壒娆″彿锛�" + taskCode);
+ return R.parse("201-浠诲姟涓嶅瓨鍦ㄦ垨宸茬粨鏉燂紒锛佷换鍔＄紪鍙凤細" + taskNo + "锛屾壒娆″彿锛�" + taskCode);
}
// 楠岃瘉鎵规鍙峰拰浠诲姟鍙风殑鍏宠仈鍏崇郴
@@ -1596,20 +1597,21 @@
@Transactional(rollbackFor = Exception.class)
public R allocateLocation(String barcode, String staNo, Integer type, Boolean full, BigDecimal weight) {
log.info("========== 寮�濮嬬敵璇峰叆搴撲换鍔★紝鍒嗛厤搴撲綅 ==========");
- log.info("鏂欑鐮侊細{}锛屽叆搴撶珯鐐癸細{}锛屽叆搴撶被鍨嬶細{}锛岀┖鏉匡細{}锛岄噸閲忥細{}", barcode, staNo, type, full, weight);
+ log.info("鏂欑鐮侊細{}锛屽叆搴撶珯鐐癸細{}锛屽叆搴撶被鍨嬶細{}锛屾弧鏉夸俊鍙凤細{}锛岄噸閲忥細{}", barcode, staNo, type, full, weight);
BigDecimal weightScaled = null;
if (weight != null) {
weightScaled = weight.setScale(4, RoundingMode.HALF_UP);
}
- // 缁熶竴璧� createInTask锛氱┖鏉�(full=true)浠呬笉鏍￠獙缁勬墭锛屼粛鏍￠獙绔欑偣銆佸垎閰嶅簱浣嶃�佸缓浠诲姟锛涢潪绌烘澘闇�缁勬墭
+ // 缁熶竴璧� createInTask锛氭弧鏉�(full=true)璧版櫘閫氬叆搴擄紱绌�/false 璧扮┖鏉垮叆搴�
TaskInParam param = new TaskInParam();
param.setBarcode(barcode);
param.setSourceStaNo(staNo);
param.setLocType1(type != null ? type : 1);
param.setUser(1L);
- param.setIoType(Boolean.TRUE.equals(full) ? TaskType.TASK_TYPE_EMPITY_IN.type : TaskType.TASK_TYPE_IN.type);
+// param.setIoType(Boolean.TRUE.equals(full) ? TaskType.TASK_TYPE_EMPITY_IN.type : TaskType.TASK_TYPE_IN.type);
+ param.setIoType(Boolean.TRUE.equals(full) ? TaskType.TASK_TYPE_IN.type : TaskType.TASK_TYPE_EMPITY_IN.type);
param.setWeight(weightScaled);
InTaskMsgDto msgDto = createInTask(param);
--
Gitblit v1.9.1