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

rev:修改单据出库校验

Browse Source
This commit is contained in:
zhangzq
2024-12-04 17:14:16 +08:00
parent f5bcfdd3af
commit 65534db1b5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ClassHandler.java
View File

@@ -36,7 +36,9 @@ public class ClassHandler extends TypeHandler<JSONObject,ExecutionEntity<JSONOb
String form_type = flowNode.getForm_type();
JSONObject auxParam = new JSONObject();
auxParam.put("form_type",form_type);
auxParam.putAll(flowNode.getAuxParam());
if (flowNode.getAuxParam()!=null){
auxParam.putAll(flowNode.getAuxParam());
}
if (!CollectionUtils.isEmpty(entity.getAuxParam())){
auxParam.putAll(entity.getAuxParam());
}