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

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
liyongde
2025-09-01 17:36:55 +08:00
parent b5300d584b 48a6a2cd22
commit 2ddc093476
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
View File

@@ -1264,9 +1264,13 @@ public class LmsToMesServiceImpl implements LmsToMesService {
if ("E".equals(RTYPE)) { if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG")); throw new BadRequestException(result.getString("RTMSG"));
} }
if (ObjectUtil.isEmpty(result.getJSONArray("RTDAT"))){
result.put("result", false);
result.put("rtdat", "没有检验结果");
return result;
}
JSONObject rtdat = result.getJSONArray("RTDAT").getJSONObject(0); JSONObject rtdat = result.getJSONArray("RTDAT").getJSONObject(0);
result.put("result", false);
result.put("rtdat", rtdat);
if (ObjectUtil.isNotEmpty(rtdat.getString("IsSampleTest")) && ObjectUtil.isNotEmpty(rtdat.getString("SampleCount")) && ObjectUtil.isNotEmpty(rtdat.getString("SampleTestResult"))) { if (ObjectUtil.isNotEmpty(rtdat.getString("IsSampleTest")) && ObjectUtil.isNotEmpty(rtdat.getString("SampleCount")) && ObjectUtil.isNotEmpty(rtdat.getString("SampleTestResult"))) {
if (rtdat.getString("IsSampleTest").equals(rtdat.getString("SampleCount")) && "PASS".equals(rtdat.getString("SampleTestResult"))) { if (rtdat.getString("IsSampleTest").equals(rtdat.getString("SampleCount")) && "PASS".equals(rtdat.getString("SampleTestResult"))) {
result.put("result", true); result.put("result", true);