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

Merge branch 'master' of http://121.40.234.130:7788/lyd/zhuzhouzhongwu

Browse Source
This commit is contained in:
zhengxuming
2025-08-04 14:27:37 +08:00
parent dd91ed8792 37d633fed9
commit d225e38f13
6 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java
View File

@@ -669,9 +669,7 @@ public class PdaJBServiceImpl implements PdaJBService {
List<IOStorInvDisDto> disDtl = inBillService.getDisDtl(map);
// 类型转换
ArrayList<LinkedHashMap> 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;

1
lms/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
View File

@@ -19,3 +19,4 @@ error_SystemAuthError=权限不足，操作失败
error_SystemError=系统繁忙，稍后在试
error_Update=更新失败
error_isNull={0}查询信息不存在
error_Empty=不允许为空

1
lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
View File

@@ -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

1
lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_id_ID.properties
View File

@@ -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

1
lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
View File

@@ -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

1
lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
View File

@@ -19,3 +19,4 @@ error_SystemAuthError=权限不足，操作失败
error_SystemError=系统繁忙，稍后在试
error_Update=更新失败
error_isNull={0}查询信息不存在
error_Empty=不允许为空