Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ005.xml

@@ -359,8 +359,8 @@
 		<isNotEmpty prepend=" AND " property="parInventType">
 			b.PAR_INVENT_TYPE = #parInventType#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="inventName">
-			a.INVENT_NAME = #inventName#
+		<isNotEmpty prepend=" AND " property="inventTypeDetail">
+			b.INVENT_TYPE_DETAIL = #inventTypeDetail#
 		</isNotEmpty>
 		ORDER BY INVENT_CODE
 	</select>

src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java

@@ -488,6 +488,7 @@ public class HGSCTools {
                 hgsc006a.setTechFlowName(o.getTechFlowName());
                 hgsc006a.setProcessCode(o.getProcessCode());
                 hgsc006a.setProcessName(o.getProcessName());
+                hgsc006a.setProcessOrder(o.getProcessOrder());
                 hgsc006a.setProductType(o.getProductType());
                 hgsc006a.setProductCode(o.getProductCode());
                 hgsc006a.setProductName(o.getProductName());

src/main/webapp/HG/SC/HGSC004A.js

 let projCode = '';
 var companyCode='';
+var rowNum=0;
 $(function () {
 
     var productCodeBox = __eiInfo.getBlock("product_block_id").getMappedRows();
@@ -61,8 +62,17 @@ $(function () {
                     let eiInfo = new EiInfo();
                     if (nodeData.lv == 2) {
                         eiInfo.set("inqu_status-0-parInventType", "root");
+                        //3级节点选择只能是构建
+                        eiInfo.set("inqu_status-0-inventTypeDetail", "1");
                     } else if (nodeData.lv == 3) {
-                        eiInfo.set("inqu_status-0-parInventType", nodeData.inventType);
+                        //4级节点选择只能是构建
+                        eiInfo.set("inqu_status-0-inventTypeDetail", "2");
+                        // inInfo.set("inqu_status-0-parInventType", nodeData.inventType);
+                    }else if (nodeData.lv == 4) {
+                        //上方刷新过树结构了
+                        //4级节点选择只能是构建
+                        eiInfo.set("inqu_status-0-inventTypeDetail", "2");
+                        // inInfo.set("inqu_status-0-parInventType", nodeData.inventType);
                     }
                     var dataSource;
                     EiCommunicator.send("HGSC004A", "queryProductComboBox", eiInfo, {
@@ -116,7 +126,8 @@ $(function () {
                         }
                         return template;
                     }
-                }, {
+                },
+                {
                     field: "productCode",
                     template: function (item) {
                         let template = "";
@@ -128,6 +139,8 @@ $(function () {
                                     item['inventType'] = productCodeBox[i]['param2Field'];
                                     console.log(item)
                                     template = productCodeBox[i]['valueField'];
+                                }else{
+                                    template = item.productCode;
                                 }
                             }
                         }
@@ -139,11 +152,17 @@ $(function () {
                         var nodeData = IPLATUI.EFTree.materialTree.selectTreeNode;
                         if (nodeData.lv == 2) {
                             inInfo.set("inqu_status-0-parInventType", "root");
+                            //3级节点选择只能是构建
+                            inInfo.set("inqu_status-0-inventTypeDetail", "1");
                         } else if (nodeData.lv == 3) {
-                            inInfo.set("inqu_status-0-parInventType", nodeData.inventType);
+                            //4级节点选择只能是构建
+                            inInfo.set("inqu_status-0-inventTypeDetail", "2");
+                            // inInfo.set("inqu_status-0-parInventType", nodeData.inventType);
                         }else if (nodeData.lv == 4) {
                             //上方刷新过树结构了
-                            inInfo.set("inqu_status-0-parInventType", nodeData.inventType);
+                            //4级节点选择只能是构建
+                            inInfo.set("inqu_status-0-inventTypeDetail", "2");
+                            // inInfo.set("inqu_status-0-parInventType", nodeData.inventType);
                         }
                         inInfo.set("field", options.field);
                         let dataSource = inventNameGlobalData;
@@ -181,9 +200,24 @@ $(function () {
                             title: '提示'
                         });
                     } else {
-                        console.log(grid.getCheckedBlockData().rows[0][10]);
+                        console.log(grid.getCheckedBlockData());
                     }
                 });
+                //给变更类型的颜色处理
+                let rows =  grid.eiBlock.rows;
+                for (let i = 0; i < rows.length; i++) {
+                    var tdId = "datacell_"+i+"_8";
+                    if (rows[i][19] === "1") {
+                        //新增
+                        document.getElementById(tdId).style.backgroundColor="green";
+                    }else if (rows[i][19] === "2"){
+                        //替换
+                        document.getElementById(tdId).style.backgroundColor="yellow";
+                    }else if (rows[i][19] === "3"){
+                        //删除
+                        document.getElementById(tdId).style.backgroundColor="red";
+                    }
+                }
 
                 // 此 grid 对象
                 // 处理父子级联动,通过监听 change 事件，判断父级节点是否发生变化