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

 Conflicts:
	src/main/java/com/baosight/hpjx/hp/cg/domain/HPCG002.java
	src/main/java/com/baosight/hpjx/hp/cg/domain/HPCG002A.java
	src/main/java/com/baosight/hpjx/hp/cg/sql/HPCG002.xml
	src/main/java/com/baosight/hpjx/hp/cg/sql/HPCG002A.xml

src/main/java/com/baosight/hpjx/hp/cg/domain/HPCG002.java

@@ -15,7 +15,7 @@ import com.baosight.iplat4j.core.util.StringUtils;
  * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
  *
  * @version 1.0
- * @history 2024-04-26 17:16:55 create
+ * @history 2024-04-26 16:24:58 create
  */
 public class HPCG002 extends DaoEPBase {
 

src/main/java/com/baosight/hpjx/hp/cg/service/ServiceHPCG002.java

+package com.baosight.hpjx.hp.cg.service;
+
+import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.core.security.UserSessionUtils;
+import com.baosight.hpjx.hp.constant.HPConstant;
+import com.baosight.hpjx.hp.xs.domain.HPXS006;
+import com.baosight.hpjx.util.CommonMethod;
+import com.baosight.hpjx.util.DateUtils;
+import com.baosight.hpjx.util.LogUtils;
+import com.baosight.hpjx.util.contants.ACConstants;
+import com.baosight.iplat4j.core.ei.EiBlock;
+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 java.util.*;
+
+/**
+ *
+ */
+public class ServiceHPCG002 extends ServiceBase {
+
+
+    /**
+     * 画面初始化.
+     */
+    @OperationLogAnnotation(operModul = "售后维修",operType = "查询",operDesc = "初始化")
+    public EiInfo initLoad(EiInfo inInfo) {
+        try {
+            /*inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0, "userId",UserSessionUtils.getFactoryCode().get(0));*/
+
+            inInfo = super.query(inInfo, HPXS006.QUERY, new HPXS006());
+            Map map = new HashMap();
+            map.put("companyCode", UserSessionUtils.getCompanyCode());
+            map.put("factoryCodes", getFactoryCode(inInfo));
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.REP_USER_ID_BLOCK_ID), map,true);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), null);
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+        }
+        return inInfo;
+    }
+
+
+    /**
+     * 查询操作.
+     */
+    @Override
+    @OperationLogAnnotation(operModul = "售后维修",operType = "查询")
+    public EiInfo query(EiInfo inInfo) {
+        inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPXS006.FIELD_REP_DATE,
+                DateUtils.formatShort(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPXS006.FIELD_REP_DATE)));
+        EiInfo outInfo = super.query(inInfo, HPXS006.QUERY, new HPXS006());
+        return outInfo;
+
+    }
+
+    /**
+     * 保存操作.
+     *
+     * @param inInfo
+     * @return
+     */
+    @OperationLogAnnotation(operModul = "售后维修",operType = "保存",operDesc = "保存")
+    public EiInfo save(EiInfo inInfo) {
+        try {
+            List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+            // 写入数据
+            for (int i = 0; i < resultRows.size(); i++) {
+                HPXS006 hpsc006 = new HPXS006();
+                hpsc006.fromMap(resultRows.get(i));
+                hpsc006.setRepDate(DateUtils.formatShort(hpsc006.getRepDate()));
+/*                HPPZ003 fPz003 = new HPPZ003();
+                if (hpsc001.getPrinc2().trim().isEmpty()) {
+                    fPz003.setCustCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPPZ003_CUST_CODE));
+                    fPz003.setCustType(CompanyTypeEnum.GQ.getCode());
+                    fPz003.setCustName(resultRows.get(i).get("princ2Name").toString());
+                    fPz003.setCompanyName(resultRows.get(i).get("princ2Name").toString());
+                    DaoUtils.insert("HPPZ003.insert", fPz003);
+                    hpsc001.setPrinc2(fPz003.getCustCode());
+                }*/
+                if (hpsc006.getId() == null || hpsc006.getId() == 0) {
+                    this.add(hpsc006);
+                } else {
+                    this.modify(hpsc006);
+                }
+            }
+            //inInfo = this.query(inInfo);
+
+            inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+            inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
+        } catch (Exception e) {
+            LogUtils.setDetailMsg(inInfo, e, "保存失败");
+        }
+        return inInfo;
+    }
+
+
+    /**
+     * 新增
+     *
+     * @param hpxs006
+     * @throws Exception
+     */
+    private void add(HPXS006 hpxs006) throws Exception {
+        hpxs006.setRepOrderNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPXS006_PROD_NO));
+        DaoUtils.insert(HPXS006.INSERT, hpxs006);
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param hpxs006
+     */
+    private void modify(HPXS006 hpxs006) {
+        DaoUtils.update(HPXS006.UPDATE, hpxs006);
+    }
+
+    /**
+     * 删除操作.
+     */
+    @OperationLogAnnotation(operModul = "售后维修",operType = "删除")
+    public EiInfo delete(EiInfo eiInfo) {
+        HPXS006 hpxs006 = new HPXS006();
+        EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
+        try {
+            for (int i = 0; i < eiBlock.getRowCount(); i++) {
+                Map<?, ?> map = eiBlock.getRow(i);
+                hpxs006.fromMap(map);
+                this.dao.delete(HPXS006.DELETE, hpxs006.toMap());
+
+            }
+        } catch (PlatException e) {
+            eiInfo.setStatus(EiConstant.STATUS_FAILURE);
+            eiInfo.setMsg("删除失败，原因参见详细错误描述！");
+            eiInfo.setDetailMsg(e.getMessage());
+            logError("删除失败！", e.getMessage());
+            return eiInfo;
+        }
+
+        eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
+        eiInfo.setMsg("删除成功！");
+        return query(eiInfo);
+    }
+
+
+    /**
+     *审核
+     */
+    @OperationLogAnnotation(operModul = "售后维修",operType = "审核")
+    public EiInfo check(EiInfo eiInfo) {
+        HPXS006 hpxs006 = new HPXS006();
+        EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
+        try {
+            for (int i = 0; i < eiBlock.getRowCount(); i++) {
+                Map<?, ?> map = eiBlock.getRow(i);
+                hpxs006.fromMap(map);
+                DaoUtils.update(HPXS006.CHECK, hpxs006.toMap());
+            }
+        } catch (PlatException e) {
+            eiInfo.setStatus(EiConstant.STATUS_FAILURE);
+            eiInfo.setMsg("审核失败，原因参见详细错误描述！");
+            eiInfo.setDetailMsg(e.getMessage());
+            logError("审核失败！", e.getMessage());
+            return eiInfo;
+        }
+        eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
+        eiInfo.setMsg("审核成功！");
+        return eiInfo;
+    }
+
+
+    /**
+     * @param inInfo
+     * @return
+     */
+
+        public List<String> getFactoryCode(EiInfo inInfo) {
+            List<String> factorycodes = new ArrayList();
+        try {
+            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "userId", UserSessionUtils.getUserId());
+            inInfo = super.query(inInfo, HPXS006.QUERYFACTORY);
+            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
+            List rows = new ArrayList();
+            for (int i = 0; i < eiBlock.getRowCount(); i++) {
+                Map<?, ?> map = eiBlock.getRow(i);
+                String factory = (String) map.get("factoryCode");
+                factorycodes.add(factory);
+            }
+        } catch (Exception e) {
+            LogUtils.setMsg(inInfo, e, "查询组失败");
+        }
+        return factorycodes;
+    }
+}

src/main/java/com/baosight/hpjx/hp/cg/sql/HPCG002.xml

@@ -64,6 +64,12 @@
 		<isNotEmpty prepend=" AND " property="proPlanStatus">
 			PRO_PLAN_STATUS = #proPlanStatus#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdDateFrom">
+			PRO_PLAN_DATE &gt;= CONCAT(REPLACE(#createdDateFrom#, '-', ''), '000000')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdDateTo">
+			PRO_PLAN_DATE &lt;= CONCAT(REPLACE(#createdDateTo#, '-', ''), '235959')
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

src/main/java/com/baosight/hpjx/hp/cg/sql/HPCG002A.xml

@@ -36,6 +36,14 @@
 	-->
 <sqlMap namespace="HPCG002A">
 
+	<sql id="authCondition">
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCodes">
+			DEP_CODE IN <iterate close=")" open="(" conjunction="," property="depCodes">#depCodes[]#</iterate>
+		</isNotEmpty>
+	</sql>
 	<sql id="condition">
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
@@ -126,6 +134,55 @@
 		</isNotEmpty>
 	</sql>
 
+	<sql id="authCondition">
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCodes">
+			DEP_CODE IN <iterate close=")" open="(" conjunction="," property="depCodes">#depCodes[]#</iterate>
+		</isNotEmpty>
+	</sql>
+
+	<select id="query" parameterClass="java.util.HashMap"
+			resultClass="com.baosight.hpjx.hp.cg.domain.HPCG002A">
+		SELECT
+		ID	as "id",  <!-- ID -->
+		COMPANY_CODE	as "companyCode",  <!-- 公司编码 -->
+		DEP_CODE	as "depCode",  <!-- 部门编码 -->
+		CREATED_BY	as "createdBy",  <!-- 创建人 -->
+		CREATED_NAME	as "createdName",  <!-- 创建人名称 -->
+		CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
+		UPDATED_BY	as "updatedBy",  <!-- 修改人 -->
+		UPDATED_NAME	as "updatedName",  <!-- 修改人名称 -->
+		UPDATED_TIME	as "updatedTime",  <!-- 修改时间 -->
+		DELETE_FLAG	as "deleteFlag",  <!-- 是否删除 0-否1-是 -->
+		CUST_CODE	as "custCode",  <!-- 供应商编码 -->
+		PRO_APPLY_DATE	as "proApplyDate",  <!-- 采购申请日期 -->
+		PRO_APPLY_NO	as "proApplyNo",  <!-- 采购申请单号 -->
+		WH_CODE	as "whCode",  <!-- 仓库编码 -->
+		WH_NAME	as "whName",  <!-- 仓库名称 -->
+		INVENT_TYPE	as "inventType",  <!-- 存货类型 -->
+		INVENT_CODE	as "inventCode",  <!-- 存货编码 -->
+		INVENT_NAME	as "inventName",  <!-- 存货名称 -->
+		INVENT_RECORD_ID	as "inventRecordId",  <!-- 存货档案ID -->
+		APPLY_AMOUNT	as "applyAmount",  <!-- 申请数量 -->
+		APPLY_UNIT_WEIGHT	as "applyUnitWeight",  <!-- 申请单重 -->
+		APPLY_WEIGHT	as "applyWeight",  <!-- 重量 -->
+		PLAN_AMOUNT	as "planAmount",  <!-- 计划数量 -->
+		PLAN_WEIGHT	as "planWeight",  <!-- 计划重量 -->
+		REMARK	as "remark",  <!-- 备注 -->
+		PRO_APPLY_STATUS	as "proApplyStatus",  <!-- 提交状态 0-未提交 1-已提交 -->
+		FACTORY_CODE	as "factoryCode",  <!-- 厂区编码 -->
+		FACTORY_NAME	as "factoryName",  <!-- 厂区名称 -->
+		PARENT_ID	as "parentId" <!-- 父级ID -->
+		FROM ${hpjxSchema}.T_HPCG002A WHERE 1=1
+		<include refid="condition" />
+		<dynamic prepend="ORDER BY">
+			<isNotEmpty property="orderBy">
+				$orderBy$
+			</isNotEmpty>
+			<isEmpty property="orderBy">
+				ID asc
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hpjx.hp.cg.domain.HPCG002A">
 		SELECT

src/main/webapp/HP/CG/HPCG002.js

+$(function () {
+
+    $("#QUERY").on("click", query);
+
+});
+
+let query = function () { resultGrid.dataSource.page(1);}
+
+
+
+

src/main/webapp/HP/CG/HPCG002.jsp

+<%--
+  Created by IntelliJ IDEA.
+  User: 1
+  Date: 2024/3/25
+  Time: 16:17
+  To change this template use File | Settings | File Templates.
+--%>
+<!DOCTYPE html>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+
+<EF:EFPage  title="采购计划">
+  <EF:EFRegion id="inqu" title="查询条件">
+    <div class="row">
+      <EF:EFDateSpan startCname="采购计划日期(从)" endCname="至" blockId="inqu_status"
+                     startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
+                     format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
+      </EF:EFDateSpan>
+      <EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
+        <EF:EFOption label="全部" value=""/>
+        <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2')"/>
+      </EF:EFSelect>
+    </div>
+    <EF:EFSelect blockId="inqu_status" row="0" ename="proPlanStatus" cname="提交状态" colWidth="3" filter="contains">
+      <EF:EFOption label="全部" value=""/>
+      <EF:EFCodeOption codeName="hpjx.hpxs.repStatus"/>
+    </EF:EFSelect>
+
+  </EF:EFRegion>
+
+  <EF:EFRegion id="result" title="明细信息">
+    <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
+      <EF:EFColumn ename="id" primaryKey="true" cname="主键" hidden="true"/>
+      <EF:EFColumn ename="companyCode" cname="公司编码" hidden="true"/>
+      <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/>
+      <EF:EFColumn ename="proPlanDate" cname="采购计划日期" width="100" align="center" editType="date" readonly="false"
+                   dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+      <EF:EFColumn ename="proPlanNo" cname="采购计划单号" enable="false" width="140" align="center"/>
+      <EF:EFComboColumn ename="inventType" cname="存货类型" width="80" align="center" required="true"
+                        readonly="true">
+        <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2')"/>
+      </EF:EFComboColumn>
+      <EF:EFComboColumn ename="repStatus" cname="维修状态" width="80" align="center" readonly="true" required="true" defaultValue="0">
+        <EF:EFCodeOption codeName="hpjx.hpxs.repStatus"/>
+      </EF:EFComboColumn>
+<%--      <EF:EFColumn cname="创建人" ename="createdName" align="center" width="150" readonly="true" required="false" enable="false"/>
+      <EF:EFColumn cname="创建时间" ename="createdTime" parseFormats="['yyyyMMddHHmmss']" editType="datetime"
+                   dateFormat="yyyy-MM-dd HH:mm:ss" align="center" width="150" readonly="true" required="false"
+                   enable="false"/>
+      <EF:EFColumn cname="修改人" ename="updatedName" align="center" width="150" readonly="true" required="false" enable="false"/>
+      <EF:EFColumn cname="修改时间" ename="updatedTime" parseFormats="['yyyyMMddHHmmss']" editType="datetime"
+                   dateFormat="yyyy-MM-dd HH:mm:ss" align="center" width="150" readonly="true" required="false"
+                   enable="false"/>--%>
+    </EF:EFGrid>
+  </EF:EFRegion>
+
+
+</EF:EFPage>

src/main/webapp/HP/CG/HPCG002A.js

+$(function () {
+
+    $("#QUERY").on("click", query);
+
+    IPLATUI.EFGrid = {
+        "result": {
+            pageable: {
+                pageSize: 10,
+                pageSizes: [10, 20, 30, 50, 100, 200],
+            },
+            columns: [{
+                field: "operator",
+                template: function (item) {
+                    let auditStatus = item.repStatus;
+                    let template = '';
+                    if (auditStatus) {
+                        if (auditStatus == 0) {
+                            template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
+                                'onclick="check(' + item.id + ',1)" >审核</a>';
+                        }
+                    }
+                    return template;
+                }
+            }],
+            loadComplete: function(grid) {
+
+            },
+            onSave: function (e) {
+                // 阻止默认请求，使用自定义保存
+                e.preventDefault();
+                //let btnNode = $(this);
+                //禁用按钮
+                //btnNode.attr("disabled", true);
+                //saveResult(btnNode);
+                save();
+            },
+            onSuccess: function (e) {
+                if (e.eiInfo.extAttr.methodName == 'save') {
+                    query();
+                }
+            },
+            onRowClick: function (e) {
+
+            },
+        }
+    }
+    downKeyUp();
+});
+
+let query = function () { resultGrid.dataSource.page(1);}
+
+
+function check(id, auditStatus) {
+    const inEiInfo = new EiInfo();
+    inEiInfo.set("result-0-id", id);
+    inEiInfo.set("result-0-repStatus", auditStatus);
+    EiCommunicator.send('HPXS006', 'check', inEiInfo, {
+            onSuccess(response) {
+                //NotificationUtil(response.msg);
+                message("审核成功");
+                resultGrid.dataSource.page(1);
+            },
+            onFail(errorMessage, status, e) {
+                NotificationUtil("执行失败！", "error");
+            }
+        },
+        {
+            async: false
+        }
+    );
+}
+
+
+/**
+ * 删除
+ */
+/*function deleteFunc() {
+    var rows = resultGrid.getCheckedRows();
+    if (rows.length == 0) {
+        message("请先勾选数据!");
+        return;
+    }
+    JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"删除\"操作?", {
+        ok: function () {
+            JSUtils.submitGridsData("result", "HPSC002A", "delete", true);
+        }
+    })
+}*/
+
+function save() {
+    var rows = resultGrid.getCheckedRows();
+    if (rows.length == 0) {
+        message("请先勾选数据!");
+        return;
+    }
+    for (let i = 0; i < rows.length; i++) {
+        if (rows[i]['repStatus']==1) {
+            message("勾选的第" + (i + 1) + "行已维修不允许修改！");
+            return;
+        }
+        if (isBlank(rows[i]['repDate'])) {
+            message("勾选的第" + (i + 1) + "行维修日期不能为空");
+            return;
+        }
+        if (isBlank(rows[i]['repCustomId'])) {
+            message("勾选的第" + (i + 1) + "行客户名称不能为空");
+            return;
+        }
+        if (isBlank(rows[i]['repUserId'])) {
+            message("勾选的第" + (i + 1) + "行维修人员不能为空");
+            return;
+        }
+        if (isBlank(rows[i]['repStatus'])) {
+            message("勾选的第" + (i + 1) + "行维修状态不能为空");
+            return;
+        }
+    }
+    JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作?", {
+        ok: function () {
+            JSUtils.submitGridsData("result", "HPXS006", "save", true);
+        }
+    })
+}
+

src/main/webapp/HP/CG/HPCG002A.jsp

+<%--
+  Created by IntelliJ IDEA.
+  User: 1
+  Date: 2024/3/25
+  Time: 16:17
+  To change this template use File | Settings | File Templates.
+--%>
+<!DOCTYPE html>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+
+<EF:EFPage  title="采购计划详情">
+  <EF:EFRegion id="inqu" title="查询条件">
+    <div class="row">
+      <EF:EFInput cname="采购申请单号" ename="inqu_status-0-proApplyNo" colWidth="3"/>
+    </div>
+
+  </EF:EFRegion>
+
+  <EF:EFRegion id="result" title="明细信息">
+    <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
+      <EF:EFColumn ename="id" primaryKey="true" cname="主键" hidden="true"/>
+      <EF:EFColumn ename="companyCode" cname="公司编码" hidden="true"/>
+      <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/>
+      <EF:EFComboColumn ename="custCode" cname="供应商名称" width="120" align="center" required="true"
+                        blockName="customer_record_block_id" textField="textField" valueField="valueField"
+                        columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
+                        filter="contains">
+      </EF:EFComboColumn>
+      <EF:EFColumn ename="proApplyDate" cname="采购申请单号" enable="false" width="140" align="center"/>
+      <EF:EFColumn ename="proApplyDate" cname="采购申请日期" width="100" align="center" editType="date" readonly="false"
+                   dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+
+      <EF:EFComboColumn ename="factoryCode" required="true"  cname="厂区" width="110" align="center" defaultValue=""
+                        filter="contains" readonly="true">
+        <EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+      </EF:EFComboColumn>
+      <EF:EFComboColumn ename="inventType" cname="存货类型" width="80" align="center" required="true"
+                        readonly="true">
+        <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2')"/>
+      </EF:EFComboColumn>
+      <EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true" readonly="true"/>
+      <EF:EFColumn ename="inventCode" cname="存货编码" hidden="true"/>
+      <EF:EFColumn ename="inventName" cname="存货名称" width="150" align="center" required="true" readonly="true"/>
+      <EF:EFColumn ename="inventRecordId" cname="规格ID" width="120" align="center" readonly="true" hidden="true"/>
+      <EF:EFColumn ename="spec" cname="规格" width="120" align="center" readonly="true"/>
+      <EF:EFColumn ename="length" cname="长(MM)" width="80" align="right" format="{0:N3}" readonly="true"/>
+      <EF:EFColumn ename="width" cname="宽(MM)" width="80" align="right" format="{0:N3}" readonly="true"/>
+      <EF:EFColumn ename="thick" cname="厚(MM)" width="80" align="right" format="{0:N3}" readonly="true"/>
+      <EF:EFColumn ename="coefficient" cname="系数" width="80" align="right" format="{0:N3}" readonly="true"/>
+      <EF:EFColumn ename="material" cname="材质" width="80" align="center" readonly="true"/>
+      <EF:EFColumn ename="unit" cname="单位" width="80" align="center" readonly="true"/>
+      <EF:EFColumn ename="applyAmount" cname="申请数量" format="{0:N0}" maxLength="20" width="100" align="right"
+                   required="true" readonly="true"/>
+      <EF:EFColumn ename="applyWeight" cname="申请重量(T)" enable="false" width="120" align="right" format="{0:N3}"/>
+      <EF:EFColumn ename="applyAmount" cname="现有库存数量" format="{0:N0}" maxLength="20" width="100" align="right"
+                   required="true" readonly="true"/>
+      <EF:EFColumn ename="applyWeight" cname="现有库存重量(T)" enable="false" width="120" align="right" format="{0:N3}"/>
+      <EF:EFColumn ename="planAmount" cname="计划数量" format="{0:N0}" maxLength="20" width="100" align="right"
+                   required="true" readonly="true"/>
+      <EF:EFColumn ename="planWeight" cname="计划重量(T)" enable="false" width="120" align="right" format="{0:N3}"/>
+      <EF:EFComboColumn ename="proApplyStatus" cname="提交状态" width="80" align="center" readonly="true" required="true" defaultValue="0">
+        <EF:EFCodeOption codeName="hpjx.hpxs.repStatus"/>
+      </EF:EFComboColumn>
+<%--      <EF:EFColumn cname="创建人" ename="createdName" align="center" width="150" readonly="true" required="false" enable="false"/>
+      <EF:EFColumn cname="创建时间" ename="createdTime" parseFormats="['yyyyMMddHHmmss']" editType="datetime"
+                   dateFormat="yyyy-MM-dd HH:mm:ss" align="center" width="150" readonly="true" required="false"
+                   enable="false"/>
+      <EF:EFColumn cname="修改人" ename="updatedName" align="center" width="150" readonly="true" required="false" enable="false"/>
+      <EF:EFColumn cname="修改时间" ename="updatedTime" parseFormats="['yyyyMMddHHmmss']" editType="datetime"
+                   dateFormat="yyyy-MM-dd HH:mm:ss" align="center" width="150" readonly="true" required="false"
+                   enable="false"/>--%>
+    </EF:EFGrid>
+  </EF:EFRegion>
+
+
+</EF:EFPage>