Ver Fonte

bug修复

hu há 9 meses atrás
pai
commit
b0040238bd

+ 2 - 0
src/custom/restcontroller/webmanage/sale/serviceorder/serviceorder.java

@@ -668,6 +668,8 @@ public class serviceorder extends Controller {
                         workpresetInfo1.setRequired(row2.getLong("required"));
                         workpresetInfo1.setRequired(row2.getLong("required"));
                         workpresetInfo1.setTextedit(row2.getLong("textedit"));
                         workpresetInfo1.setTextedit(row2.getLong("textedit"));
                         workpresetInfo1.setSignature(row2.getLong("signature"));
                         workpresetInfo1.setSignature(row2.getLong("signature"));
+                        workpresetInfo1.setPasscheck(row.getLong("passcheck"));
+                        workpresetInfo1.setQuestionedit(row.getLong("questionedit"));
                         String workpresetjson1 = JSONObject.toJSONString(workpresetInfo1);
                         String workpresetjson1 = JSONObject.toJSONString(workpresetInfo1);
                         SQLFactory sqlFactory1 = new SQLFactory(this, "服务工单流程节点新增");
                         SQLFactory sqlFactory1 = new SQLFactory(this, "服务工单流程节点新增");
                         sqlFactory1.addParameter("sa_workorder_nodeid", createTableID("sa_workorder_node"));
                         sqlFactory1.addParameter("sa_workorder_nodeid", createTableID("sa_workorder_node"));

+ 3 - 1
src/custom/restcontroller/webmanage/sale/workorder/workorder.java

@@ -1038,6 +1038,8 @@ public class workorder extends Controller {
                         workpresetInfo1.setRequired(row2.getLong("required"));
                         workpresetInfo1.setRequired(row2.getLong("required"));
                         workpresetInfo1.setTextedit(row2.getLong("textedit"));
                         workpresetInfo1.setTextedit(row2.getLong("textedit"));
                         workpresetInfo1.setSignature(row2.getLong("signature"));
                         workpresetInfo1.setSignature(row2.getLong("signature"));
+                        workpresetInfo1.setPasscheck(row.getLong("passcheck"));
+                        workpresetInfo1.setQuestionedit(row.getLong("questionedit"));
                         String workpresetjson1 = JSONObject.toJSONString(workpresetInfo1);
                         String workpresetjson1 = JSONObject.toJSONString(workpresetInfo1);
                         SQLFactory sqlFactory1 = new SQLFactory(this, "服务工单流程节点新增");
                         SQLFactory sqlFactory1 = new SQLFactory(this, "服务工单流程节点新增");
                         sqlFactory1.addParameter("sa_workorder_nodeid", createTableID("sa_workorder_node"));
                         sqlFactory1.addParameter("sa_workorder_nodeid", createTableID("sa_workorder_node"));
@@ -1095,7 +1097,7 @@ public class workorder extends Controller {
             RowsMap attRowsMap = getAttachmentUrl("sa_workorder_node", ids);
             RowsMap attRowsMap = getAttachmentUrl("sa_workorder_node", ids);
             if (attRowsMap.get(sa_workorder_nodeid) == null
             if (attRowsMap.get(sa_workorder_nodeid) == null
                     || attRowsMap.get(sa_workorder_nodeid).isEmpty()) {
                     || attRowsMap.get(sa_workorder_nodeid).isEmpty()) {
-                return "请填写完整工序内容:附件没有上传";
+                //return "请填写完整工序内容:附件没有上传";
             }
             }
         }
         }
         // 是否添加物料
         // 是否添加物料