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

代码合并

Browse Source
This commit is contained in:
liuxy
2022-12-13 13:41:48 +08:00
parent e0f1decfda
commit 1ef6c07c2e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
View File

@@ -472,15 +472,15 @@ public class BakingServiceImpl implements BakingService {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
JSONObject jsonCool = coolIvtTab.query("full_point_code = '" + point_code + "'").uniqueResult(0); JSONObject jsonCool = coolIvtTab.query("full_point_code = '" + point_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonCool.getString("container_name"))) { if (ObjectUtil.isNotEmpty(jsonCool)) {
json.put("container_name", jsonCool.getString("container_name")); json.put("container_name", jsonCool.getString("container_name"));
} else { } else {
JSONObject jsonHot = hotIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0); JSONObject jsonHot = hotIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonHot.getString("container_name"))) { if (ObjectUtil.isNotEmpty(jsonHot)) {
json.put("container_name", jsonHot.getString("container_name")); json.put("container_name", jsonHot.getString("container_name"));
} else { } else {
JSONObject jsonPoint = pointIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0); JSONObject jsonPoint = pointIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonPoint.getString("material_code"))) { if (ObjectUtil.isNotEmpty(jsonPoint)) {
json.put("container_name", jsonPoint.getString("material_code")); json.put("container_name", jsonPoint.getString("material_code"));
} else { } else {
json.put("container_name", ""); json.put("container_name", "");