diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
index d08ade145..b2dd6d33c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
@@ -54,7 +54,7 @@
FROM
pdm_bi_subpackagerelation
WHERE
- container_name IN (SELECT container_name FROM bst_ivt_packageinfoivt WHERE point_status = '3')
+ container_name IN (SELECT container_name FROM bst_ivt_packageinfoivt WHERE point_status = '6')
AND sale_order_name LIKE CONCAT('%', #{sale_order_name}, '%')
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index 006ccd474..bb2774e37 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -404,9 +404,9 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl packagerelationList = JSONObject.parseArray(whereJson.getJSONArray("tableMater").toJSONString(), PdmBiSubpackagerelation.class);
List isOutBox = packagerelationList.stream().filter(r -> r.getStatus().equals("0")).collect(Collectors.toList());
- if (isOutBox.size() > 0) {
- throw new BadRequestException("标记为黄色的子卷号已分配木箱,请重新选择未分配木箱的子卷");
- }
+ if (isOutBox.size() > 0) {
+ throw new BadRequestException("标记为黄色的子卷号已分配木箱,请重新选择未分配木箱的子卷");
+ }
JSONArray jsonArray = whereJson.getJSONArray("tableMater");
if (jsonArray == null || jsonArray.size() == 0) {
throw new BadRequestException("无选中子卷信息");
@@ -467,14 +467,14 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl装箱区agv任务
- String finalDeviceCode = deviceCode;
- CompletableFuture.runAsync(() -> {
- try {
- agvTransfer(packagerelationList, finalDeviceCode, boxSn);
- } catch (Exception e) {
- log.error("异常信息:" + e);
- }
- }, pool);
+ // String finalDeviceCode = deviceCode;
+ // CompletableFuture.runAsync(() -> {
+ // try {
+ // agvTransfer(packagerelationList, finalDeviceCode, boxSn);
+ // } catch (Exception e) {
+ // log.error("异常信息:" + e);
+ // }
+ // }, pool);
}
private String getPointCode() {
diff --git a/lms/nladmin-system/src/main/java/org/nl/config/thread/AsyncTaskExecutePool.java b/lms/nladmin-system/src/main/java/org/nl/config/thread/AsyncTaskExecutePool.java
index d0405e84d..9eb668558 100644
--- a/lms/nladmin-system/src/main/java/org/nl/config/thread/AsyncTaskExecutePool.java
+++ b/lms/nladmin-system/src/main/java/org/nl/config/thread/AsyncTaskExecutePool.java
@@ -17,6 +17,7 @@ package org.nl.config.thread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.AsyncConfigurer;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -63,6 +64,8 @@ public class AsyncTaskExecutePool implements AsyncConfigurer {
return executor;
}
+
+
@Override
public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
return (throwable, method, objects) -> {
diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
index 64daf2c6d..7313a8da2 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
@@ -66,7 +66,7 @@ export default {
url: 'api/Materialbase',
idField: 'material_id',
sort: 'material_id,desc',
- query: { search: 'MX', material_id: '' },
+ query: { box: '木箱', material_id: '' },
crudMethod: { ...crudMaterattr }
})
},