修改后材料替换bug

modules/ration_glj/facade/ration_glj_facade.js

@@ -55,7 +55,6 @@ const projectDao = require('../../pm/models/project_model').project;
 const compleClassModel = mongoose.model('complementary_glj_section');
 
 
-
 let operationMap = {
     'ut_create': create_ration_glj,
     'ut_update': update_ration_glj,
@@ -751,13 +750,16 @@ async function updateRationGLJFromDoc(rg,doc,priceInfo) {
     let projcetGLJ_n = await gljListModel.modifyGLJ(projectGLJ, rg);
     doc.code = projcetGLJ_n.code;
     doc.projectGLJID = projcetGLJ_n.id;
-    if (projcetGLJ_n.unit_price.is_add == 1) {
-        doc.createType = 'replace';
-        doc.rcode = projcetGLJ_n.original_code;
-    } else {
+    if(rg.createType == 'replace'&& rg.rcode == projcetGLJ_n.code){//如果原数据已经是替换过的，这次替换又恢复成原数据，则把类型改回来
         doc.createType = 'normal';
-        doc.rcode = '';
     }
+    if (rg.createType===undefined || rg.createType == 'normal'){// createTypel 默认是normal 只有是定额下带的工料机才需把类型改成替换，其它的保持不变
+        if(rg.code != projcetGLJ_n.code){
+            doc.createType = 'replace';
+            doc.rcode = rg.code;
+        }
+    }
+
     await ration_glj.findOneAndUpdate({ID:rg.ID}, doc);
     return [projcetGLJ_n,doc]
 }

web/building_saas/main/js/views/main_tree_col.js

@@ -44,7 +44,6 @@ let MainTreeCol = {
             if(!isDef(node)){
                 return '';
             }
-
             let rst = '';
             if(node.sourceType === projectObj.project.Ration.getSourceType() && node.data.type === rationType.ration
                 && isDef(node.data.code) && isDef(node.data.prefix) && node.data.prefix !== ''){