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-11-11 11:12:13 +08:00
parent adff1cb797
commit e713811890
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,15 +258,22 @@ public class MesToLmsServiceImpl implements MesToLmsService {
if (ObjectUtil.isEmpty(bakingTemperature)) throw new BadRequestException("温度不能为空"); if (ObjectUtil.isEmpty(bakingTemperature)) throw new BadRequestException("温度不能为空");
if (ObjectUtil.isEmpty(bakingTimer)) throw new BadRequestException("烘烤时间不能为空"); if (ObjectUtil.isEmpty(bakingTimer)) throw new BadRequestException("烘烤时间不能为空");
String point_code = "";
JSONObject jsonCoolIvt = coolIvtTab.query("container_name = '" + containerName + "' and full_point_status = '02' and cool_ivt_status <> '03'").uniqueResult(0); JSONObject jsonCoolIvt = coolIvtTab.query("container_name = '" + containerName + "' and full_point_status = '02' and cool_ivt_status <> '03'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonCoolIvt)) throw new BadRequestException("母卷不存在或已烘烤完成"); if (ObjectUtil.isEmpty(jsonCoolIvt)) {
JSONObject jsonPoint = pointTab.query("material_code ='" + containerName + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonPoint)) point_code = jsonPoint.getString("point_code");
} else {
point_code = jsonCoolIvt.getString("full_point_code");
}
if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("母卷不存在或已烘烤完成");
// 调用接口输入参数 // 调用接口输入参数
jsonParam.put("option", "1"); jsonParam.put("option", "1");
jsonParam.put("container_name", containerName); jsonParam.put("container_name", containerName);
jsonParam.put("temperature", bakingTemperature); jsonParam.put("temperature", bakingTemperature);
jsonParam.put("hours", bakingTimer); jsonParam.put("hours", bakingTimer);
jsonParam.put("point_code", jsonCoolIvt.getString("full_point_code")); jsonParam.put("point_code", point_code);
// 调用手持接口 // 调用手持接口
BakingServiceImpl bakingService = new BakingServiceImpl(); BakingServiceImpl bakingService = new BakingServiceImpl();