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

# Conflicts:
#	src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ007.java
#	src/main/webapp/HP/PZ/HPPZ007.js
#	src/main/webapp/HP/PZ/HPPZ007.jsp

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

@@ -46,6 +46,13 @@ public enum DdynamicEnum {
     /**
      * 模块：存货档案
      * 用途：存货档案下拉框
+     * 编写：jhs
+     */
+    MATERIAL_RECORD_BLOCK_ID("material_record_block_id","inventCode","inventName","HPPZ006.queryMaterialComboBox"),
+
+	/**
+	 * 模块：存货档案
+	 * 用途：存货档案下拉框
 	 * 编写：wwl
 	 */
 	INVENT_SPEC_BLOCK_ID("invent_spec_block_id","spec","spec","HPPZ006.queryComboBoxSpec"),

src/main/java/com/baosight/hpjx/common/InventTypeEnun.java

@@ -26,6 +26,27 @@ public enum InventTypeEnun {
         this.value = value;
     }
 
+    public static String getNameByCode(String code){
+        String returnName = "";
+        switch (code){
+            case "1":
+                returnName = MATERIAL.value;
+                break;
+            case "2":
+                returnName = CONSUMABLE.value;
+                break;
+            case "3":
+                returnName = SEMI_FINISHED_PRODUCT.value;
+                break;
+            case "4":
+                returnName = FINISHED_PRODUCT.value;
+                break;
+            default:
+                break;
+        }
+        return returnName;
+    };
+
     public Integer getCode() {
         return code;
     }
@@ -46,20 +67,20 @@ public enum InventTypeEnun {
         EiBlock block = new EiBlock("customer_type_block_id");
         List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>() {{
             add(new HashMap<String, Object>() {{
-                put(HPConstants.TEXT_FIELD, MATERIAL.code);
-                put(HPConstants.VALUE_FIELD, MATERIAL.value);
+                put(HPConstants.TEXT_FIELD, MATERIAL.code + HPConstants.SPLICING_SYMBOL + MATERIAL.value);
+                put(HPConstants.VALUE_FIELD, MATERIAL.code);
             }});
             add(new HashMap<String, Object>() {{
-                put(HPConstants.TEXT_FIELD, CONSUMABLE.code);
-                put(HPConstants.VALUE_FIELD, CONSUMABLE.value);
+                put(HPConstants.TEXT_FIELD, CONSUMABLE.code + HPConstants.SPLICING_SYMBOL + CONSUMABLE.value);
+                put(HPConstants.VALUE_FIELD, CONSUMABLE.code);
             }});
             add(new HashMap<String, Object>() {{
-                put(HPConstants.TEXT_FIELD, SEMI_FINISHED_PRODUCT.code);
-                put(HPConstants.VALUE_FIELD, SEMI_FINISHED_PRODUCT.value);
+                put(HPConstants.TEXT_FIELD, SEMI_FINISHED_PRODUCT.code + HPConstants.SPLICING_SYMBOL + SEMI_FINISHED_PRODUCT.value);
+                put(HPConstants.VALUE_FIELD, SEMI_FINISHED_PRODUCT.code);
             }});
             add(new HashMap<String, Object>() {{
-                put(HPConstants.TEXT_FIELD, FINISHED_PRODUCT.code);
-                put(HPConstants.VALUE_FIELD, FINISHED_PRODUCT.value);
+                put(HPConstants.TEXT_FIELD, FINISHED_PRODUCT.code + HPConstants.SPLICING_SYMBOL + FINISHED_PRODUCT.value);
+                put(HPConstants.VALUE_FIELD, FINISHED_PRODUCT.code);
             }});
         }};
         block.setRows(rows);

src/main/java/com/baosight/hpjx/hp/constant/HPConstant.java

@@ -20,6 +20,10 @@ public class HPConstant {
 		public static final String HPKC008_NUMBER = "HPKC008_NUMBER";
 		// 巡检单号
 		public static final String HPZL001_NUMBER = "HPZL001_NUMBER";
+		//采购入库单号
+		public static final String HPKC001_NUMBER = "HPKC001_NUMBER";
+		//生产领料单号
+		public static final String HPKC002_NUMBER = "HPKC002_NUMBER";
 		// 生产入库单号
 		public static final String HPKC003_PROD_NO = "HPKC003_PROD_NO";
 		// 生产销售单号

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC001.java

 package com.baosight.hpjx.hp.kc.service;
 
 import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.common.HPConstants;
 import com.baosight.hpjx.common.InventTypeEnun;
+import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC001;
+import com.baosight.hpjx.hp.kc.domain.HPKC001;
+import com.baosight.hpjx.hp.kc.domain.HPKC005;
+import com.baosight.hpjx.hp.kc.domain.HPKC009;
+import com.baosight.hpjx.hp.pz.domain.HPPZ007;
+import com.baosight.hpjx.hp.pz.domain.THppz004;
+import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.CommonMethod;
+import com.baosight.hpjx.util.LogUtils;
 import com.baosight.hpjx.util.StringUtil;
 import com.baosight.hpjx.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -11,9 +21,11 @@ import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
+import com.baosight.iplat4j.ed.util.SequenceGenerator;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author YK
@@ -26,17 +38,17 @@ public class ServiceHPKC001 extends ServiceBase {
      */
     @Override
     public EiInfo initLoad(EiInfo inInfo) {
-        HPKC001 HPKC001 = new HPKC001();
-        EiInfo outInfo = super.initLoad(inInfo, HPKC001);
-        outInfo.getBlock(EiConstant.resultBlock).getRows().clear();
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_QUERY_BLOCK_ID), null);
-
-        EiBlock block = outInfo.addBlock(EiConstant.queryBlock);
-        block.setCell(ACConstants.ROW_CODE_0, ACConstants.PARAM_WH_CODE, outInfo.getBlock(ACConstants.WH_CODE_BLOCK_ID).getRow(ACConstants.ROW_CODE_0).get(ACConstants.FIELD_VALUE));
-        block.setCell(ACConstants.ROW_CODE_0, ACConstants.PARAM_WH_CODE, outInfo.getBlock(ACConstants.WH_CODE_QUERY_BLOCK_ID).getRow(ACConstants.ROW_CODE_0).get(ACConstants.FIELD_VALUE));
-        outInfo.setBlock(InventTypeEnun.generatorEiBlock());
-        return outInfo;
+        try {
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_QUERY_BLOCK_ID), null);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), null);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null);
+            inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC001().eiMetadata);
+            inInfo.setBlock(InventTypeEnun.generatorEiBlock());
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+        }
+        return inInfo;
     }
 
     /**
@@ -60,15 +72,31 @@ public class ServiceHPKC001 extends ServiceBase {
     public EiInfo insert(EiInfo inInfo) {
         try {
             CommonMethod.creatorInfo(inInfo,EiConstant.resultBlock);
-            for (int i = 0; i < inInfo.getBlock(EiConstant.resultBlock).getRowCount(); i++) {
-                String documentTime = inInfo.getCellStr(EiConstant.resultBlock,i,"documentTime");
-                if(StringUtils.isNotBlank(documentTime)){
-                    inInfo.setCell(EiConstant.resultBlock,i,"documentTime", StringUtil.removeHorizontalLine(documentTime));
-                }
-                inInfo.setCell(EiConstant.resultBlock,i,"status", 1);
-                inInfo.setCell(EiConstant.resultBlock,i,"approvalStatus", 0);
-                super.insert(inInfo,"HPKC001.insert");
-            }
+            List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+            this.checkSaveData(resultRows);
+            // 写入数据
+            for (int i = 0; i < resultRows.size(); i++) {
+                HPKC001 insertEntity = new HPKC001();
+                insertEntity.fromMap(resultRows.get(i));
+                // 仓库名称
+                Map params = new HashMap<>();
+                params.put("whCode", insertEntity.getWhCode());
+                List query = dao.query("HPPZ007.queryByWhCode", params);
+                insertEntity.setWhName(((HPPZ007) query.get(0)).getWhName());
+                //物料类型
+                insertEntity.setMaterialTypeName(InventTypeEnun.getNameByCode(insertEntity.getMaterialType()));
+                // 生成单据号
+                insertEntity.setDocumentCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC001_NUMBER));
+                // 去除日期字符串中的-
+                insertEntity.setDocumentTime(StringUtil.removeHorizontalLine(insertEntity.getDocumentTime()));
+                insertEntity.setStatus(1);
+                insertEntity.setApprovalStatus(0);
+                DaoUtils.insert("HPKC001.insert", insertEntity);
+            }
+            inInfo = this.query(inInfo);
+            inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+            inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
+
         } catch (PlatException e) {
             inInfo.setStatus(EiConstant.STATUS_FAILURE);
             inInfo.setMsg("操作失败！原因参见详细错误描述！");
@@ -80,6 +108,23 @@ public class ServiceHPKC001 extends ServiceBase {
         return query(inInfo);
     }
 
+    /**
+     * 校验保存的数据
+     *
+     * @param resultRows
+     */
+    private void checkSaveData(List<Map> resultRows) {
+        for (int i = 0; i < resultRows.size(); i++) {
+            HPKC001 entity = new HPKC001();
+            entity.fromMap(resultRows.get(i));
+            AssertUtils.isEmpty(entity.getMaterialType(), "物料类型不能为空");
+            AssertUtils.isEmpty(entity.getMaterialCode(), "物料不能为空");
+            AssertUtils.isEmpty(entity.getWhCode(), "仓库不能为空");
+
+        }
+    }
+
+
 
     /**
      * 修改操作.
@@ -87,25 +132,31 @@ public class ServiceHPKC001 extends ServiceBase {
     @Override
     public EiInfo update(EiInfo inInfo) {
         try {
-            CommonMethod.creatorInfo(inInfo,EiConstant.resultBlock);
-            HPKC001 hpkc001 = new HPKC001();
-            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
-            for (int i = 0; i < eiBlock.getRowCount(); i++) {
-                Map<?, ?> map = eiBlock.getRow(i);
-                hpkc001.fromMap(map);
-                String documentTime = inInfo.getCellStr(EiConstant.resultBlock,i,"documentTime");
-                if(StringUtils.isNotBlank(documentTime)){
-                    inInfo.setCell(EiConstant.resultBlock,i,"documentTime", StringUtil.removeHorizontalLine(documentTime));
-                }
-                this.dao.update("HPKC001.update", hpkc001.toMap());
-            }
-            inInfo.setStatus(EiConstant.STATUS_SUCCESS);
-            inInfo.setMsg("修改成功！");
+            CommonMethod.udpateInfo(inInfo,EiConstant.resultBlock);
+            List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+            this.checkSaveData(resultRows);
+            // 写入数据
+            for (int i = 0; i < resultRows.size(); i++) {
+                HPKC001 updateEntity = new HPKC001();
+                updateEntity.fromMap(resultRows.get(i));
+                // 仓库名称
+                Map params = new HashMap<>();
+                params.put("whCode", updateEntity.getWhCode());
+                List query = dao.query("HPPZ007.queryByWhCode", params);
+                updateEntity.setWhName(((HPPZ007) query.get(0)).getWhName());
+                //物料类型
+                updateEntity.setMaterialTypeName(InventTypeEnun.getNameByCode(updateEntity.getMaterialType()));
+                DaoUtils.update("HPKC001.update", updateEntity);
+            }
+            inInfo = this.query(inInfo);
+            inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+            inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
+
         } catch (PlatException e) {
             inInfo.setStatus(EiConstant.STATUS_FAILURE);
             inInfo.setMsg("操作失败！原因参见详细错误描述！");
             inInfo.setDetailMsg(e.getMessage());
-            logError("修改失败", e.getMessage());
+            logError("新增失败", e.getMessage());
             return inInfo;
         }
         return query(inInfo);

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC001.xml

@@ -110,8 +110,8 @@
 		UPDATE hpjx.t_hpkc001
 		SET
 			UPDATED_BY = #updatedBy#,
-			UPDATED_BY = #updatedBy#,
-			UPDATED_BY = #updatedBy#
+			UPDATED_NAME = #updatedName#,
+			UPDATED_TIME = #updatedTime#
 		<isNotEmpty property="companyCode">
 			,COMPANY_CODE = #companyCode#
 		</isNotEmpty>

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ006.xml

@@ -136,6 +136,21 @@
 		ORDER BY INVENT_CODE
 	</select>
 
+	<select id="queryMaterialComboBox" parameterClass="java.util.HashMap"
+			resultClass="java.util.HashMap">
+		SELECT DISTINCT
+		INVENT_CODE as "inventCode",
+		INVENT_NAME as "inventName"
+		FROM hpjx.t_hppz006 WHERE STATUS=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventType">
+			INVENT_TYPE = #inventType#
+		</isNotEmpty>
+		ORDER BY INVENT_CODE
+	</select>
+
     <!-- 规格下拉框 -->
     <select id="queryComboBoxSpec" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
         SELECT DISTINCT
@@ -147,6 +162,9 @@
         <isNotEmpty prepend=" AND " property="inventCode">
             INVENT_CODE = #inventCode#
         </isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventType">
+			INVENT_TYPE = #inventType#
+		</isNotEmpty>
         ORDER BY ID
     </select>
 

src/main/java/com/baosight/hpjx/util/CommonMethod.java

@@ -99,6 +99,21 @@ public class CommonMethod {
         }
     }
 
+    public static void udpateInfo(EiInfo eiInfo, String resultBlock){
+
+        EiBlock block=eiInfo.getBlock(resultBlock);
+        String userId = UserSession.getLoginName();
+        String userName = UserSession.getLoginCName();
+        String time = DateUtils.curDateTimeStr14();
+        for(int i=0; i < block.getRowCount(); i++){
+            //TODO 公司代码待补充
+            block.setCell(i, HPConstants.SQL_FIELD_COMPANYCODE, "");
+            block.setCell(i, HPConstants.SQL_FIELD_UPDATED_BY, userId);
+            block.setCell(i, HPConstants.SQL_FIELD_UPDATED_NAME, userName);
+            block.setCell(i, HPConstants.SQL_FIELD_UPDATED_TIME, time);
+        }
+    }
+
     public static void updateuserInfo(EiInfo eiInfo, String resultBlock){
 
         EiBlock block=eiInfo.getBlock(resultBlock);

src/main/webapp/HP/KC/HPKC001.js

+let materialCodeGlobalData = [];
+let whCodeGlobalData = [];
+let specGlobalData = [];
 $(function() {
     var editorModel0 = '';
     var eiInfo = new EiInfo();
-    var globalData = [];
-    var day1 = new Date();
-    day1.setTime(day1.getTime());
-    var s1 = day1.getFullYear() + "-" + (day1.getMonth() + 1) + "-" + day1.getDate();
-    $("#inqu_status-0-receiptDate").val(s1);
     // 查询
     $("#QUERY").on("click", function () {
         resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
     });
 
-    IPLATUI.EFGrid = {
-        "result": {
+    IPLATUI.EFGrid.result = {
+        pageable: {
+            pageSize: 20,
+            pageSizes: [10, 20, 30, 50, 100, 200],
+        },
         columns: [
             {
                 field: "materialCode",
-                    // template: function(dataItem) {
-                    //     for (var i = 0 ; i < globalData.length ; i++) {
-                    //         if ( globalData[i]['valueField'] === dataItem['materialCode']) {
-                    //             return globalData[i]['textField'];
-                    //         }
-                    //     }
-                    //     return "";
-                    // },
+                template: function(dataItem) {
+                    for (var i = 0 ; i < materialCodeGlobalData.length ; i++) {
+                        if ( materialCodeGlobalData[i]['valueField'] === dataItem['materialCode']) {
+                            return materialCodeGlobalData[i]['textField'];
+                        }
+                    }
+                    return "";
+                },
                 editor: function (container, options) {
                     var grid = container.closest(".k-grid").data("kendoGrid");
                     var cellIndex = grid.cellIndex(container);
@@ -35,10 +36,10 @@ $(function() {
                     eiInfo.set("inventType", options.model["materialType"]);
                     var dataSource;
 
-                        EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {
+                    EiCommunicator.send("HPPZ006", "queryMaterialComboBox", eiInfo, {
                         onSuccess: function (ei) {
-                                dataSource = ei.getBlock("invent_name_block_id").getMappedRows();
-                                globalData = dataSource;
+                            dataSource = ei.getBlock("material_record_block_id").getMappedRows();
+                            materialCodeGlobalData = dataSource;
                         }, onFail: function (ei) {
                         }
                     }, {async: false});
@@ -51,139 +52,115 @@ $(function() {
                         template: "#=textField#"
                     });
                 },
+            },
+            {
+                field: "whCode",
+                template: function(dataItem) {
+                    for (var i = 0 ; i < whCodeGlobalData.length ; i++) {
+                        if ( whCodeGlobalData[i]['valueField'] === dataItem['whCode']) {
+                            return whCodeGlobalData[i]['textField'];
                         }
-            ],
-            onRowClick : function(e) {
-                editorModel0 = e.row;
-                $("input[name='whCode']").on('change', function (me) {
-                    var whCode = $("input[name='whCode']").val();
-                    var whCodeData;
-                    EiCommunicator.send("HPKC001", "queryWhCodeSetName", eiInfo, {
+                    }
+                    return "";
+                },
+                editor: function (container, options) {
+                    var input = $('<input />');
+                    input.attr("name", options.field);
+                    input.attr("id", options.field);
+                    input.appendTo(container);
+
+                    var whEiInfo = new EiInfo();
+                    whEiInfo.set("whType", options.model["materialType"]);
+                    var dataSource;
+                    EiCommunicator.send("HPPZ007", "queryComboBox", whEiInfo, {
                         onSuccess: function (ei) {
-                            var queryData = ei.getBlock("wh_record_block_id").getMappedRows();
-                            whCodeData = queryData;
-                            whCodeData.forEach(title => {
-                                if(title.valueField == whCode){
-                                    var valueField = title.textField.substring(title.textField.lastIndexOf('-')+1);
-                                    resultGrid.setCellValue(editorModel0, "whName", valueField);
-                                }
-                            })
+                            dataSource = ei.getBlock("wh_record_block_id").getMappedRows();
+                            whCodeGlobalData = dataSource;
                         }, onFail: function (ei) {
                         }
                     }, {async: false});
+
+                    input.kendoDropDownList({
+                        valuePrimitive: true,
+                        dataTextField: "textField",
+                        dataValueField: "valueField",
+                        dataSource: dataSource,
+                        template: "#=textField#"
                     });
-                $("input[name='materialType']").on('change', function (me) {
-                    var materialType = $("input[name='materialType']").val();
-                    var materialTypeData;
-                    EiCommunicator.send("HPKC001", "queryMaterialTypeSetName", eiInfo, {
-                        onSuccess: function (ei) {
-                            var queryData = ei.getBlock("customer_type_block_id").getMappedRows();
-                            materialTypeData = queryData;
-                            materialTypeData.forEach(title => {
-                                if(title.textField == materialType){
-                                    resultGrid.setCellValue(editorModel0, "materialTypeName", title.valueField);
+                },
+            },
+            {
+                field: "spec",
+                template: function(dataItem) {
+                    for (var i = 0 ; i < specGlobalData.length ; i++) {
+                        if ( specGlobalData[i]['valueField'] === dataItem['spec']) {
+                            return specGlobalData[i]['textField'];
+                        }
                     }
-                            })
+                    return "";
+                },
+                editor: function (container, options) {
+                    var input = $('<input />');
+                    input.attr("name", options.field);
+                    input.attr("id", options.field);
+                    input.appendTo(container);
 
+                    var specEiInfo = new EiInfo();
+                    specEiInfo.set("inqu_status-0-inventCode", options.model["materialCode"]);
+                    specEiInfo.set("inqu_status-0-inventType", options.model["materialType"]);
+                    var dataSource;
+                    EiCommunicator.send("HPPZ006", "queryComboBoxSpec", specEiInfo, {
+                        onSuccess: function (ei) {
+                            dataSource = ei.getBlock("invent_spec_block_id").getMappedRows();
+                            specGlobalData = dataSource;
                         }, onFail: function (ei) {
                         }
                     }, {async: false});
+
+                    input.kendoDropDownList({
+                        valuePrimitive: true,
+                        dataTextField: "textField",
+                        dataValueField: "valueField",
+                        dataSource: dataSource,
+                        template: "#=textField#"
+                    });
+                },
+            }
+        ],
+        onRowClick : function(e) {
+            editorModel0 = e.row;
+            $("input[name='materialType']").on('change', function (me) {
                 //清空物料信息
                 resultGrid.setCellValue(editorModel0, "materialName", "");
                 resultGrid.setCellValue(editorModel0, "materialCode", "");
+                resultGrid.setCellValue(editorModel0, "whCode", "");
+                resultGrid.setCellValue(editorModel0, "whName", "");
+                resultGrid.setCellValue(editorModel0, "spec", "");
+                resultGrid.setCellValue(editorModel0, "unit", "");
             });
             $("input[name='materialCode']").on('change', function (me) {
-                    var materialCode = $("input[name='materialCode']").val();
                 var materialType = $("input[name='materialType']").val();
                 var queryEiInfo = new EiInfo();
                 queryEiInfo.set("inventType", materialType);
-                    var dataSource;
-                    EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {
-                        onSuccess: function (ei) {
-                            var queryData = ei.getBlock("invent_name_block_id").getMappedRows();
-                            dataSource = queryData;
-                            dataSource.forEach(title => {
-                                if(title.valueField == materialCode){
-                                    var valueField = title.textField.substring(title.textField.lastIndexOf('-')+1);
-                                    resultGrid.setCellValue(editorModel0, "materialName", valueField);
-                                }
-                            })
+                EiCommunicator.send("HPPZ006", "query", eiInfo, {
+                    onSuccess: function (eiInfo) {
+                        var status = eiInfo.getStatus();
+                        if (status != "-1") {
+                            console.log(eiInfo)
+                            var materialName = eiInfo.blocks.result.rows[0][2];
+                            var materialCode = eiInfo.blocks.result.rows[0][3];
+                            var spec = eiInfo.blocks.result.rows[0][6];
+                            var unit = eiInfo.blocks.result.rows[0][12];
+                            resultGrid.setCellValue(e.row, "materialCode", materialCode);
+                            resultGrid.setCellValue(e.row, "materialName", materialName);
+                            resultGrid.setCellValue(e.row, "unit", unit);
+                        }
                     }, onFail: function (ei) {
                     }
                 }, {async: false});
             });
         },
         loadComplete: function (grid) {
-                // 新增
-                $("#BTN_INSERT").on("click", function () {
-                    var btnNode = $(this);
-                    //禁用按钮
-                    btnNode.attr("disabled", true);
-                    IPLAT.submitNode($("#HPKC001"), "HPKC001", "insert", {
-                        onSuccess: function (ei) {
-                            if (ei["status"] == -1) {
-                                NotificationUtil(ei, "error");
-                            } else {
-                                // 绑定grid
-                                resultGrid.setEiInfo(ei);
-                                NotificationUtil({
-                                    msg: '新增成功'
-                                });
-                            }
-                            //释放禁用按钮
-                            btnNode.attr("disabled", false);
-                            resultGrid.dataSource.page(1);
-                        },
-                        onFail: function (ei) { // onFail 表示失败回调函数
-                            // 发生异常
-                            console.log(ei);
-                            //释放禁用按钮
-                            btnNode.attr("disabled", false);
-                        }
-                    });
-                });
-
-                // 修改
-                $("#BTN_UPDATE").on("click", function () {
-                    var rowCount = resultGrid.getCheckedRows();
-                    // 检验是否选中数据
-                    if (rowCount == null || rowCount == "") {
-                        NotificationUtil({
-                            msg : '请选择一条或多条数据'
-                        }, "warning");
-                        return false;
-                    }
-                    var btnNode = $(this);
-                    //禁用按钮
-                    btnNode.attr("disabled", true);
-
-                    IPLAT.submitNode($("#HPKC001"), "HPKC001", "update", {
-                        onSuccess: function (ei) {
-                            if (ei["status"] == -1) {
-                                NotificationUtil(ei, "error");
-                            } else {
-                                NotificationUtil({
-                                    msg: '修改成功'
-                                });
-
-                                // 绑定grid
-                                resultGrid.setEiInfo(ei);
-                            }
-                            //释放禁用按钮
-                            btnNode.attr("disabled", false);
-                            resultGrid.dataSource.page(1);
-                        },
-                        onFail: function (ei) { // onFail 表示失败回调函数
-                            // 发生异常
-                            console.log(ei);
-                            //释放禁用按钮
-                            btnNode.attr("disabled", false);
-                        }
-                    });
-
-                });
-
-
             //删除
             $("#DELETE").on("click", function () {
 
@@ -228,12 +205,54 @@ $(function() {
                 });
             });
 
-            }
-
         },
-
+        onSuccess: function (e) {
+            if (e.type != 'read') {
+                // 新增、修改、删除的时候刷新页面
+                resultGrid.dataSource.page(1);
+            }
+            showPreview();
+        }
 
     };
 
 });
+/**
+ * 页面加载时执行
+ */
+$(window).load(function () {
+    // 存货名称
+    let inInfo = new EiInfo();
+    EiCommunicator.send("HPPZ006", "queryMaterialComboBox", inInfo, {
+        onSuccess: function (ei) {
+            materialCodeGlobalData = ei.getBlock("material_record_block_id").getMappedRows();
+        },
+        onFail: function (ei) {
+        }
+    }, {async: false});
+    EiCommunicator.send("HPPZ006", "queryComboBoxSpec", inInfo, {
+        onSuccess: function (ei) {
+            specGlobalData = ei.getBlock("invent_spec_block_id").getMappedRows();
+        },
+        onFail: function (ei) {
+        }
+    }, {async: false});
+
+    EiCommunicator.send("HPPZ007", "queryComboBox", inInfo, {
+        onSuccess: function (ei) {
+            whCodeGlobalData = ei.getBlock("wh_record_block_id").getMappedRows();
+        },
+        onFail: function (ei) {
+        }
+    }, {async: false});
+    // 查询
+    query();
+});
+
+/**
+ * 查询
+ */
+let query = function () {
+    resultGrid.dataSource.page(1);
+}
 

src/main/webapp/HP/KC/HPKC001.jsp

@@ -25,39 +25,25 @@
         <EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
             <EF:EFColumn ename="id" cname="主键id" hidden="true"/>
             <EF:EFColumn ename="documentTime" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" width="100" required="true"/>
-            <EF:EFColumn ename="documentCode" cname="采购入库单号" width="100" readonly="false" align="center" required="true"/>
-            <EF:EFComboColumn ename="whCode"
-                              cname="仓库编码"
-                              columnTemplate="#=textField#"
-                              itemTemplate="#=textField#"
-                              blockName="wh_record_block_id"
-                              textField="textField"
-                              valueField="valueField"
-                              align="center"
-                              filter="contains"
-                              width="100"
-                              required="true"
-            >
-            </EF:EFComboColumn>
-            <EF:EFColumn ename="whName" cname="仓库名称" width="120" readonly="true" align="center" enable="false" required="true"/>
+            <EF:EFColumn ename="documentCode" cname="采购入库单号" width="100" readonly="false" align="center" required="false" enable="false" />
             <EF:EFComboColumn ename="materialType"
                               cname="物料类型"
                               columnTemplate="#=textField#"
                               itemTemplate="#=textField#"
                               blockName="customer_type_block_id"
                               textField="textField"
-                              valueField="textField"
+                              valueField="valueField"
                               align="center"
                               filter="contains"
                               width="100"
-                              required="true"
             >
             </EF:EFComboColumn>
-            <EF:EFColumn ename="materialTypeName" cname="物料类型名称" width="100" readonly="true" enable="false" required="true" />
+            <EF:EFColumn ename="whCode" cname="仓库名称" width="100" readonly="false" required="true"/>
+            <EF:EFColumn ename="whName" cname="仓库名称" width="100" readonly="false" hidden="true"/>
             <EF:EFColumn ename="materialCode" cname="物料编码" width="100" readonly="false" required="true"/>
-            <EF:EFColumn ename="materialName" cname="物料名称" width="100" readonly="false" required="true"/>
+            <EF:EFColumn ename="materialName" cname="物料名称" width="100" readonly="false" enable="false"  required="true"/>
+            <EF:EFColumn ename="unit" cname="单位" width="80" readonly="false" align="center" enable="false"  required="true"/>
             <EF:EFColumn ename="spec" cname="规格" width="120" readonly="false" align="center"  required="true"/>
-            <EF:EFColumn ename="unit" cname="单位" width="80" readonly="false" align="center" required="true"/>
             <EF:EFColumn ename="quantity" cname="数量" width="80" defaultValue="0" data-regex="/^[0-9]\\\d*$/" data-errorprompt="请输入正整数" readonly="false" align="right" required="true"/>
             <EF:EFColumn ename="weight" cname="重量" defaultValue="0" data-rules="number" maxLength="20" width="100" align="right" readonly="false"/>
             <EF:EFColumn ename="remarks" cname="备注" width="100" readonly="false"/>