root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:6.18 线上部署测试环境

Browse Source
This commit is contained in:
gongbaoxiong
2024-06-18 12:48:01 +08:00
parent e8dec156d5
commit 15a46f0c62
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
View File

@@ -54,7 +54,7 @@
FROM FROM
pdm_bi_subpackagerelation pdm_bi_subpackagerelation
WHERE 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')
<if test="sale_order_name != null and sale_order_name != ''"> <if test="sale_order_name != null and sale_order_name != ''">
AND sale_order_name LIKE CONCAT('%', #{sale_order_name}, '%') AND sale_order_name LIKE CONCAT('%', #{sale_order_name}, '%')
</if> </if>

22
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
View File

@@ -404,9 +404,9 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
public void updateEntityList(JSONObject whereJson) { public void updateEntityList(JSONObject whereJson) {
List<PdmBiSubpackagerelation> packagerelationList = JSONObject.parseArray(whereJson.getJSONArray("tableMater").toJSONString(), PdmBiSubpackagerelation.class); List<PdmBiSubpackagerelation> packagerelationList = JSONObject.parseArray(whereJson.getJSONArray("tableMater").toJSONString(), PdmBiSubpackagerelation.class);
List<PdmBiSubpackagerelation> isOutBox = packagerelationList.stream().filter(r -> r.getStatus().equals("0")).collect(Collectors.toList()); List<PdmBiSubpackagerelation> isOutBox = packagerelationList.stream().filter(r -> r.getStatus().equals("0")).collect(Collectors.toList());
if (isOutBox.size() > 0) { if (isOutBox.size() > 0) {
throw new BadRequestException("标记为黄色的子卷号已分配木箱，请重新选择未分配木箱的子卷"); throw new BadRequestException("标记为黄色的子卷号已分配木箱，请重新选择未分配木箱的子卷");
} }
JSONArray jsonArray = whereJson.getJSONArray("tableMater"); JSONArray jsonArray = whereJson.getJSONArray("tableMater");
if (jsonArray == null || jsonArray.size() == 0) { if (jsonArray == null || jsonArray.size() == 0) {
throw new BadRequestException("无选中子卷信息"); throw new BadRequestException("无选中子卷信息");
@@ -467,14 +467,14 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
} }
}, pool); }, pool);
//待检区->装箱区agv任务 //待检区->装箱区agv任务
String finalDeviceCode = deviceCode; // String finalDeviceCode = deviceCode;
CompletableFuture.runAsync(() -> { // CompletableFuture.runAsync(() -> {
try { // try {
agvTransfer(packagerelationList, finalDeviceCode, boxSn); // agvTransfer(packagerelationList, finalDeviceCode, boxSn);
} catch (Exception e) { // } catch (Exception e) {
log.error("异常信息：" + e); // log.error("异常信息：" + e);
} // }
}, pool); // }, pool);
} }
private String getPointCode() { private String getPointCode() {

3
lms/nladmin-system/src/main/java/org/nl/config/thread/AsyncTaskExecutePool.java
View File

@@ -17,6 +17,7 @@ package org.nl.config.thread;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.AsyncConfigurer; import org.springframework.scheduling.annotation.AsyncConfigurer;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -63,6 +64,8 @@ public class AsyncTaskExecutePool implements AsyncConfigurer {
return executor; return executor;
} }
@Override @Override
public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
return (throwable, method, objects) -> { return (throwable, method, objects) -> {

2
lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
View File

@@ -66,7 +66,7 @@ export default {
url: 'api/Materialbase', url: 'api/Materialbase',
idField: 'material_id', idField: 'material_id',
sort: 'material_id,desc', sort: 'material_id,desc',
query: { search: 'MX', material_id: '' }, query: { box: '木箱', material_id: '' },
crudMethod: { ...crudMaterattr } crudMethod: { ...crudMaterattr }
}) })
}, },