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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-08-22 14:54:26 +08:00
parent 811d192b84
commit 778935ca8b
4 changed files with 67 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
View File

@@ -714,7 +714,8 @@ public class FormulaServiceImpl implements FormulaService {
HashMap<String, Object> oneMap = new HashMap<>();
// 工令相关
oneMap.put("workorder_code", jsonWork.getString("workorder_code"));
String workorder_code = jsonWork.getString("workorder_code");
oneMap.put("workorder_code", workorder_code.substring(workorder_code.length() - 7));
oneMap.put("material_code", jsonMater.getString("material_code"));
if (ObjectUtil.isNotEmpty(jsonDept)) oneMap.put("dept_name", jsonDept.getString("name"));
if (ObjectUtil.isNotEmpty(jsonMaterExt)) oneMap.put("old_mark", jsonMaterExt.getString("old_mark"));

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
View File

@@ -296,8 +296,9 @@ public class PhysicalMstServiceImpl implements PhysicalMstService {
json.put("remark", jsonDtl.getString("remark"));
json.put("is_ok", jsonDtl.getString("is_ok"));
} else {
String down_limit = json.getString("down_limit");
if (ObjectUtil.isNotEmpty(down_limit)) json.put("value",down_limit);
// 获取默认检测值 默认为下限检测值
// String down_limit = json.getString("down_limit");
// if (ObjectUtil.isNotEmpty(down_limit)) json.put("value",down_limit);
}
}
form.put("tableData", arr);