Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/java/com/baosight/hggp/common/DdynamicEnum.java

src/main/java/com/baosight/hggp/common/DdynamicEnum.java

@@ -88,21 +88,24 @@ public enum DdynamicEnum {
 	COMPANY_CODE_BLOCK_ID("company_code_block_id", "orgId", "orgCname", "HGXSOrg.queryAll"),
 	
 	/**
-	 * 模块：公司名称
-	 * 用途：工序设计下拉框
-	 * 编写：ly
-	 */
-	COMPANY_BOX_BLOCK_ID("companyBox_block_id","orgEname","orgCname","HGSJ001.queryCompany"),
-	
-	/**
-	 * 模块：工序编码
-	 * 用途：工序编码下拉框
-	 * 编写：ly
-	 */
-	PROCESS_CODE_BLOCK_ID("processCode_block_id","processCode","processName","HGSJ001.queryProcessCode")
-	;
-	
-	/** 将结果集放入的块名  */
+     * 模块：公司名称
+     * 用途：工序设计下拉框
+     * 编写：ly
+     */
+    COMPANY_BOX_BLOCK_ID("companyBox_block_id","orgEname","orgCname","HGSJ001.queryCompany"),
+
+    /**
+     * 模块：工序编码
+     * 用途：工序编码下拉框
+     * 编写：ly
+     */
+    PROCESS_CODE_BLOCK_ID("processCode_block_id","processCode","processName","factoryCode","factoryName","HGSJ001.queryProcessCode")
+    ;
+
+
+
+
+    /** 将结果集放入的块名  */
     private final String blockId;
     /** 字段名 */
     private final String value;

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ002A.java

@@ -33,12 +33,13 @@ public class ServiceHGSJ002A extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ002A.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         //inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HGPZ002A.FIELD_PARENT_ID,inInfo.get("inqu_status-0-parendId"));
         //inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HGPZ002A.FIELD_FLOW_CODE,inInfo.get("inqu_status-0-flowCode"));
-        //inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HGPZ002A.FIELD_FLOW_NAME,inInfo.get("inqu_status-0-flowName"));
+        String factoryCode = inInfo.getCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HGSJ002A.FIELD_FACTORY_CODE).toString();
         inInfo = super.query(inInfo, HGSJ002A.QUERY, new HGSJ002A());
         CommonMethod.initBlock(inInfo,
                 Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.PROCESS_CODE_BLOCK_ID),
                 new HashMap<String,Object>(){{
                     put("orgType", OrgTypeEnum.COMPANY.getCode());
+                    put(HGSJ002A.FIELD_FACTORY_CODE,factoryCode);
                     put(HGSJ002A.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);}}
         );
         return inInfo;

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ003.java

@@ -158,9 +158,11 @@ public class ServiceHGSJ003 extends ServiceEPBase {
         // 重复校验
         String msg;
         Map queryParam = new HashMap();
-        queryParam.put(HGSJ003.FIELD_ACCOUNT_CODE,hgsj003.getAccountCode());
+        //queryParam.put(HGSJ003.FIELD_ACCOUNT_CODE,hgsj003.getAccountCode());
+        queryParam.put(HGSJ003.FIELD_FACTORY_CODE,hgsj003.getFactoryCode());
         queryParam.put(HGSJ003.FIELD_PROCESS_CODE, hgsj003.getProcessCode());
         queryParam.put(HGSJ003.FIELD_PROCESS_CLASS,hgsj003.getProcessClass());
+        queryParam.put(HGSJ003.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
         if (StringUtils.isBlank(hgsj003.getSpec())) {
             queryParam.put("notSpec", CommonConstant.YesNo.YES);
             msg = String.format("工序编码[%s]已存在无规格，请勿重复添加！", hgsj003.getProcessCode());

src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ001.xml

@@ -276,10 +276,12 @@
 	<select id="queryProcessCode" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
 		SELECT
 		PROCESS_CODE	as "processCode",  <!-- 工序编码 -->
-		PROCESS_NAME	as "processName"  <!-- 工序名称 -->
+		CONCAT('[',FACTORY_NAME,']',PROCESS_NAME)	as "processName",  <!-- 工序名称 -->
+		FACTORY_CODE	as "factoryCode",  <!-- 厂区编码 -->
+		FACTORY_NAME	as "factoryName"  <!-- 厂区名称 -->
 		FROM ${hggpSchema}.HGGY001 WHERE 1=1
 		<include refid="condition" />
-		group by PROCESS_CODE,PROCESS_NAME
+		group by PROCESS_CODE,PROCESS_NAME,FACTORY_CODE,FACTORY_NAME
 
 	</select>
 

src/main/java/com/baosight/hggp/util/ExcelUtils.java

@@ -499,7 +499,7 @@ public class ExcelUtils {
 			msg = String.format("工序编码[%s]已存在无规格，请勿重复添加！", hgsj003.getProcessCode());
 		} else {
 			queryParam.put("spec", hgsj003.getSpec());
-			msg = String.format("工厂[%s]工序编码[%s]已存在规格[%s]，请勿重复添加！", hgsj003.getFactoryCode(), hgsj003.getProcessCode(), hgsj003.getSpec());
+			msg = String.format("公司[%s]工序名称[%s]已存在规格[%s]，请勿重复添加！", hgsj003.getFactoryName(), hgsj003.getProcessName(), hgsj003.getSpec());
 		}
 		List<HGSJ003> hgsj003List = dao.query(HGSJ003.QUERY, queryParam);
 		AssertUtils.isNotEmpty(hgsj003List, msg);

src/main/webapp/HG/SJ/HGSJ003.js

@@ -51,6 +51,18 @@ $(function (){
                     },
                 }, {
                     field: "processCode",
+                    filter: function (options) {
+                        var factoryCode = options.model['factoryCode'];
+                        if(factoryCode) {
+                            // 返回我们过滤后的数据集
+                            /*return options.values[0][province];*/
+                            return _.filter(processCodes, function (item) {
+                                return item["param1Field"]==factoryCode;
+                            })
+                        } else {
+                            return processCodes;
+                        }
+                    },
                     template: function (dataItem) {
                         for (let i = 0; i < processCodes.length; i++) {
                             if (processCodes[i]['valueField'] === dataItem['processCode']) {
@@ -88,8 +100,28 @@ $(function (){
                 }
             ],
             loadComplete: function(grid) {
+                // 此 grid 对象
+                // 处理父子级联动,通过监听 change 事件，判断父级节点是否发生变化
+                grid.dataSource.bind("change", function(e) {
+                    // 判断父级节点是否发生变化
+                    if (e.field == "factoryCode") {
+                        loadChange(grid,e,"processCode");
+                    }else if (e.field == "processCode") {
+                        if (e.items[0].factoryCode.length===0){
+                            loadChange(grid,e,"factoryCode");
+                        }
+                    }
+                });
             },
             afterEdit:function (e) {
+                if (e.field === "processCode" && e.model["factoryCode"].length === 0){
+                    for (let i = 0; i < processCodes.length; i++) {
+                        if (e.model[e.field] === processCodes[i]["valueField"]){
+                            e.model["factoryCode"] = processCodes[i]["param1Field"]
+                            break;
+                        }
+                    }
+                }
             },
             onSave: function (e) {
                 // 阻止默认请求，使用自定义保存
@@ -166,6 +198,7 @@ $(function (){
                                     {msg: ei.msg, detailMsg: ei.detailMsg}, "error");
                             } else {
                                 NotificationUtil(ei.msg);
+                                query();
                             }
                         },
                         onFail(ei) {
@@ -183,6 +216,26 @@ $(function (){
         }
     }
 
+    //工厂类型下拉联动
+    $('input[name="inqu_status-0-factoryCode"]').change(function () {
+        let dataEdition= processCodes;
+        var factoryCode=$("#inqu_status-0-factoryCode").val();
+        if (factoryCode){
+            dataEdition = _.filter(processCodes, function (item) {
+                return item["param1Field"]==factoryCode;
+            })
+        }
+        var input=$("#inqu_status-0-processCode");
+        input.kendoDropDownList({
+            valuePrimitive: true,
+            dataTextField: "textField",
+            dataValueField: "valueField",
+            optionLabel:"请选择",
+            dataSource: dataEdition,
+            template: "#=textField#"
+        });
+    });
+
     //grush.downloadFile(`${ctx}\\DC\\BB\\template\\DCAMIN02_附加费用管理.xls`);
 })
 
@@ -217,11 +270,9 @@ let save = function (btnNode) {
     if(flag) {
         JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
             ok: function () {
-                JSUtils.submitGridsData("result", "HGSJ003", "save", true,
-                    function (e) {
-                        query();
-                    });
+                JSUtils.submitGridsData("result", "HGSJ003", "save", true);
                 btnNode.attr("disabled", false);
+
             }
         });
     }
@@ -244,3 +295,25 @@ function updateStatus(id,status) {
         }
     );
 }
+
+function loadChange(grid,e,field) {
+    var cell_label = field,that = grid;
+    // locked 表示是否为固定列
+    var locked = that.isCellLocked(cell_label);
+    // tr 表示 locked 和非 locked 的行,index 表示此行的第几列
+    var tr,index;
+    // 获取此 model 元素信息
+    var item = e.items[0];
+    var _uid = item.uid;
+    if (locked) {
+        tr = $(".k-grid-content-locked tr[data-uid="+ _uid +"]");
+        index = $("th[data-field='"+cell_label+"']").data("index");
+    } else {
+        tr = $(".k-grid-content tr[data-uid="+ _uid +"]");
+        index = parseInt($("th[data-field='"+cell_label+"']").data("index")) - that.lockedHeader.find("th").length;
+    }
+    // 获取子 cell(td)
+    var td = tr.children("td:eq("+index+")");
+    // 触发 td.click 事件，
+    td.trigger("click");
+}
\ No newline at end of file