From 37d633fed9413be7d95b149f468671476c4da5b6 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 4 Aug 2025 11:07:43 +0800 Subject: [PATCH] fix: 1 --- .../pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java | 4 +--- .../src/main/resources/language/error/error.properties | 1 + .../src/main/resources/language/error/error_en_US.properties | 1 + .../src/main/resources/language/error/error_id_ID.properties | 1 + .../src/main/resources/language/error/error_in_ID.properties | 1 + .../src/main/resources/language/error/error_zh_CN.properties | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java index 5c50d31..d56032b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java @@ -669,9 +669,7 @@ public class PdaJBServiceImpl implements PdaJBService { List disDtl = inBillService.getDisDtl(map); // 类型转换 ArrayList tableMater = new ArrayList<>(); - disDtl.forEach(item -> { - tableMater.add(JSONObject.parseObject(JSONObject.toJSONString(item), LinkedHashMap.class)); - }); + disDtl.forEach(item -> tableMater.add(JSONObject.parseObject(JSONObject.toJSONString(item), LinkedHashMap.class))); jsonMst.put("tableMater", tableMater); jsonMst.put("workorder_id", workorderId); return jsonMst; diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties index 3bfc620..6683ede 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties @@ -19,3 +19,4 @@ error_SystemAuthError=权限不足，操作失败 error_SystemError=系统繁忙，稍后在试 error_Update=更新失败 error_isNull={0}查询信息不存在 +error_Empty=不允许为空 diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties index 1af35f5..04fac55 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties @@ -19,3 +19,4 @@ error_SystemAuthError=Insufficient permissions, operation failed error_SystemError=The system is busy, please try again later error_Update=Update failed error_isNull={0}query is null +error_Empty=must not empty diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_id_ID.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_id_ID.properties index 496f769..5e775bd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_id_ID.properties +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_id_ID.properties @@ -19,3 +19,4 @@ error_SystemAuthError=Keizinan tidak cukup, operasi gagal error_SystemError=Sistemnya sibuk, tolong coba lagi nanti error_Update=Kemaskini gagal error_isNull={0}Pertanyaan Tidak ada +error_Empty=must not empty diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties index 496f769..5e775bd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties @@ -19,3 +19,4 @@ error_SystemAuthError=Keizinan tidak cukup, operasi gagal error_SystemError=Sistemnya sibuk, tolong coba lagi nanti error_Update=Kemaskini gagal error_isNull={0}Pertanyaan Tidak ada +error_Empty=must not empty diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties index 3bfc620..6683ede 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties @@ -19,3 +19,4 @@ error_SystemAuthError=权限不足，操作失败 error_SystemError=系统繁忙，稍后在试 error_Update=更新失败 error_isNull={0}查询信息不存在 +error_Empty=不允许为空