From 0654d2378fb0a0217ab827c6e748943f07e3fd93 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 30 Oct 2023 18:22:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E6=8B=A3=E6=BB=A1=E6=96=99?=
=?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=AD=98=E5=82=A8=E6=9C=A8=E6=89=98=E7=9B=98?=
=?UTF-8?q?=E8=BD=BD=E5=85=B7=E5=8F=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 2 +-
.../org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 013d888..f2cb1d2 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -828,7 +828,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
vehicleType, GroupBindMaterialStatusEnum.BOUND.getValue());
String extData = baseVehiclematerialgroup.getExt_data();
PalletizeDto palletizeDto = new PalletizeDto();
- if (extData == null || extData.equals("null")) {
+ if (extData != null && !extData.equals("null")) {
// 转成实体
palletizeDto = CommonUtils.toJavaObject(extData, PalletizeDto.class);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java
index 7da294a..4ed3a0f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java
@@ -151,10 +151,6 @@ public class FJMKTask extends AbstractTask {
.collect(Collectors.toList());
JSONObject jsonObject = JSONObject.parseObject(task.getRequest_param());
String startPoint = task.getPoint_code1();
- // 获取起点 回写载具编码
- SchBasePoint startPointObj = pointService.getById(startPoint);
- // 起点的木托盘编码
- task.setVehicle_code(startPointObj.getVehicle_code());
// 找终点
/** 包装位 */
SchBasePoint packagePoint = findNextPoint(nextRegionStr, jsonObject);
@@ -380,7 +376,6 @@ public class FJMKTask extends AbstractTask {
fjcPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
fjcPointObj.setVehicle_qty(1);
fjcPointObj.setVehicle_type(taskObj.getVehicle_type());
- fjcPointObj.setVehicle_code(taskObj.getVehicle_code2()); // 拿过来的载具编码
PointUtils.setUpdateByType(fjcPointObj, taskFinishedType);
pointService.updateById(fjcPointObj);
}