处理BUG，新增领料逻辑

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC002.java

@@ -47,6 +47,8 @@ public class HPKC002 extends DaoEPBase {
 	public static final String FIELD_OLD_REQ_NO = "oldReqNo";    		/* 原领料单号*/
 	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除0.否1.是*/
 
+	public static final String FIELD_PROJ_CODE = "projCode";    		/* 项目编码*/
+	
 	public static final String COL_ID = "ID";    		/* 主键id*/
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
 	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
@@ -71,6 +73,8 @@ public class HPKC002 extends DaoEPBase {
 	public static final String COL_KC_ID = "KC_ID";    		/* 库存ID*/
 	public static final String COL_OLD_REQ_NO = "OLD_REQ_NO";    		/* 原领料单号*/
 	public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 是否删除0.否1.是*/
+	public static final String COL_PROJ_CODE = "PROJ_CODE";    		/* 项目编码*/
+
 	
 	public static final String QUERY = "HPKC002.query";
 	public static final String COUNT = "HPKC002.count";
@@ -102,6 +106,7 @@ public class HPKC002 extends DaoEPBase {
 	private Long kcId;	/* 库存ID*/
 	private String oldReqNo = " ";		/* 原领料单号*/
 	private Integer deleteFlag;	/* 是否删除0.否1.是*/
+	private String projCode = " ";		/* 项目编码*/
 
 	/**
 	 * initialize the metadata.
@@ -215,7 +220,9 @@ public class HPKC002 extends DaoEPBase {
 		eiColumn.setDescName("是否删除0.否1.是");
 		eiMetadata.addMeta(eiColumn);
 
-		
+		eiColumn = new EiColumn(FIELD_PROJ_CODE);
+		eiColumn.setDescName("项目编码");
+		eiMetadata.addMeta(eiColumn);
 	}
 	
 	/**
@@ -610,6 +617,22 @@ public class HPKC002 extends DaoEPBase {
 		this.deleteFlag = deleteFlag;
 	}
 	/**
+	 * get the projCode - 项目编码.
+	 * @return the projCode
+	 */
+	public String getProjCode() {
+		return this.projCode;
+	}
+
+	/**
+	 * set the projCode - 项目编码.
+	 *
+	 * @param projCode - 项目编码
+	 */
+	public void setProjCode(String projCode) {
+		this.projCode = projCode;
+	}
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -641,6 +664,7 @@ public class HPKC002 extends DaoEPBase {
 		setKcId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_KC_ID)), kcId));
 		setOldReqNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_OLD_REQ_NO)), oldReqNo));
 		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
+		setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
 	}
 	
 	/**
@@ -674,6 +698,7 @@ public class HPKC002 extends DaoEPBase {
 		map.put(FIELD_KC_ID, StringUtils.toString(kcId, eiMetadata.getMeta(FIELD_KC_ID)));
 		map.put(FIELD_OLD_REQ_NO, StringUtils.toString(oldReqNo, eiMetadata.getMeta(FIELD_OLD_REQ_NO)));
 		map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
+		map.put(FIELD_PROJ_CODE, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_PROJ_CODE)));
 
 		return map;
 	}

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

@@ -9,14 +9,7 @@ import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC002;
 import com.baosight.hpjx.hp.kc.domain.HPKC010;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
-import com.baosight.hpjx.util.AssertUtils;
-import com.baosight.hpjx.util.BeanUtils;
-import com.baosight.hpjx.util.CommonMethod;
-import com.baosight.hpjx.util.DateUtils;
-import com.baosight.hpjx.util.EiInfoUtils;
-import com.baosight.hpjx.util.LogUtils;
-import com.baosight.hpjx.util.MapUtils;
-import com.baosight.hpjx.util.ObjectUtils;
+import com.baosight.hpjx.util.*;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
@@ -56,6 +49,10 @@ public class ServiceHPKC002A extends ServiceEPBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), queryMap, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
+			String projCode = inInfo.getString("inqu_status-0-projCode");
+			if (StringUtils.isNotBlank(projCode)) {
+				inInfo.set("inqu_result-0-projCode", projCode);
+			}
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC010().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -91,6 +88,7 @@ public class ServiceHPKC002A extends ServiceEPBase {
 	@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "生产领料单-库存查询-生成出库单")
 	public EiInfo select(EiInfo inInfo) {
 		try {
+			String projCode = inInfo.getString("inqu_result-0-projCode");
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
 			// 库存ID
 			List<Long> ids = ObjectUtils.listKey(resultRows, "id");
@@ -101,7 +99,7 @@ public class ServiceHPKC002A extends ServiceEPBase {
 			// 状态校验
 			this.checkData(resultRows, dbKc010Map);
 			// 生成销售库单
-			this.saveData(resultRows, dbKc010Map);
+			this.saveData(resultRows, dbKc010Map, projCode);
 		} catch (Exception e) {
 			LogUtils.setMsg(inInfo, e, "生成领料单失败");
 		}
@@ -132,7 +130,7 @@ public class ServiceHPKC002A extends ServiceEPBase {
 	 * @param resultRows
 	 * @param dbKc010Map
 	 */
-	private void saveData(List<Map> resultRows, Map<Long, HPKC010> dbKc010Map) {
+	private void saveData(List<Map> resultRows, Map<Long, HPKC010> dbKc010Map, String projCode) {
 		for (Map row : resultRows) {
 			BigDecimal applyAmount = MapUtils.getBigDecimal(row, "applyAmount");
 			String applyRemark = MapUtils.getString(row, "applyRemark");
@@ -146,6 +144,7 @@ public class ServiceHPKC002A extends ServiceEPBase {
 			newKc002.setRemark(applyRemark);
 			newKc002.setKcId(kcId);
 			newKc002.setDeleteFlag(CommonConstant.YesNo.NO_0);
+			newKc002.setProjCode(projCode);
 			DaoUtils.insert(HPKC002.INSERT, newKc002);
 			// 修改库存数量
 			HPKCTools.updateStock(newKc002.getWhCode(), newKc002.getInventRecordId(),

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

@@ -26,10 +26,12 @@
         REMARK as "remark",  <!-- 备注 -->
         KC_ID as "kcId",  <!-- 库存ID -->
         OLD_REQ_NO as "oldReqNo",  <!-- 原领料单号 -->
-        DELETE_FLAG as "deleteFlag" <!-- 是否删除0.否1.是 -->
+        DELETE_FLAG as "deleteFlag", <!-- 是否删除0.否1.是 -->
+        PROJ_CODE as "projCode"
     </sql>
 
 	<sql id="condition">
+
         <isNotEmpty prepend=" AND " property="id">
             ID = #id#
         </isNotEmpty>
@@ -90,6 +92,9 @@
         <isNotEmpty prepend=" AND " property="deleteFlag">
             DELETE_FLAG = #deleteFlag#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="projCode">
+            PROJ_CODE = #projCode#
+        </isNotEmpty>
 	</sql>
 
     <sql id="customCondition">
@@ -158,12 +163,13 @@
             REMARK,  <!-- 备注 -->
             KC_ID,  <!-- 库存ID -->
             OLD_REQ_NO,  <!-- 原领料单号 -->
-            DELETE_FLAG  <!-- 是否删除0.否1.是 -->
+            DELETE_FLAG,  <!-- 是否删除0.否1.是 -->
+        PROJ_CODE
         ) VALUES (
             #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
             #reqNo#, #receiptDate#, #whCode#, #whName#, #inventType#, #inventCode#,
             #inventName#, #inventRecordId#, #amount#, #unitWeight#, #weight#, #remark#, #kcId#,
-            #oldReqNo#, #deleteFlag#
+            #oldReqNo#, #deleteFlag#, #projCode#
         )
     </insert>
 
@@ -204,4 +210,8 @@
         GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE, INVENT_RECORD_ID
     </select>
 
+    <select id="countNumByProjCode" resultClass="int">
+        SELECT COUNT(*) FROM hpjx.t_hpkc002 WHERE 1=1
+        AND PROJ_CODE = #projCode#
+    </select>
 </sqlMap>

src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC006.java

@@ -60,6 +60,10 @@ public class HPSC006 extends DaoEPBase {
     public static final String FIELD_PART_NAME = "partName";    		/* 零件名称*/
     public static final String FIELD_CUT_SCHEDULE = "cutSchedule";    		/*下料进度*/
 
+    public static final String FIELD_REQ_NUM = "reqNum";    		/*领料记录*/
+
+
+
     public static final String COL_ID = "ID";
     public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
     public static final String COL_PROJ_CODE = "PROJ_CODE";    		/* 项目编码*/
@@ -96,6 +100,7 @@ public class HPSC006 extends DaoEPBase {
     public static final String COL_PRDT_NAME = "PRDT_NAME";    		/* 产品名称*/
     public static final String COL_PART_NAME = "PART_NAME";    		/* 零件名称*/
     public static final String COL_CUT_SCHEDULE = "CUT_SCHEDULE";    		/* 下料进度*/
+    public static final String COL_REQ_NUM = "REQ_NUM";    		/* 领料记录*/
 
 
     public static final String QUERY = "HPSC006.query";
@@ -142,6 +147,8 @@ public class HPSC006 extends DaoEPBase {
     private String partName = " ";		/* 零件名称*/
     private String cutSchedule = "";
 
+    private Integer reqNum = new Integer(0);
+
     /**
      * initialize the metadata.
      */
@@ -316,6 +323,10 @@ public class HPSC006 extends DaoEPBase {
         eiColumn = new EiColumn(FIELD_CUT_SCHEDULE);
         eiColumn.setDescName("下料进度");
         eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_REQ_NUM);
+        eiColumn.setDescName("领料记录");
+        eiMetadata.addMeta(eiColumn);
     }
 
     /**
@@ -896,6 +907,23 @@ public class HPSC006 extends DaoEPBase {
     }
 
     /**
+     * get the reqNum - 领料记录
+     * @return the reqNum
+     */
+    public Integer getReqNum() {
+        return this.reqNum;
+    }
+
+    /**
+     * set the reqNum - 领料记录
+     *
+     * @param reqNum - 领料记录
+     */
+    public void setReqNum(Integer reqNum) {
+        this.reqNum = reqNum;
+    }
+
+    /**
      * get the value from Map.
      *
      * @param map - source data map
@@ -939,6 +967,7 @@ public class HPSC006 extends DaoEPBase {
         setPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_NAME)), prdtName));
         setPartName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_NAME)), partName));
         setCutSchedule(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CUT_SCHEDULE)), cutSchedule));
+        setReqNum(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_REQ_NUM)), reqNum));
     }
 
     /**
@@ -984,6 +1013,7 @@ public class HPSC006 extends DaoEPBase {
         map.put(FIELD_PRDT_NAME, StringUtils.toString(prdtName, eiMetadata.getMeta(FIELD_PRDT_NAME)));
         map.put(FIELD_PART_NAME, StringUtils.toString(partName, eiMetadata.getMeta(FIELD_PART_NAME)));
         map.put(FIELD_CUT_SCHEDULE, StringUtils.toString(cutSchedule, eiMetadata.getMeta(FIELD_CUT_SCHEDULE)));
+        map.put(FIELD_REQ_NUM, StringUtils.toString(reqNum, eiMetadata.getMeta(FIELD_REQ_NUM)));
         return map;
     }
 }

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC003.java

@@ -244,6 +244,7 @@ public class ServiceHPSC003 extends ServiceBase {
 		newSc005.setRemark1(dbSc004.getRemark());
 		newSc005.setPlanCompletionDate(dbSc004.getPlanCompletionDate());
 		newSc005.setNum(dbSc004.getNum());
+		newSc005.setUnassignedNum(dbSc004.getNum());
 		newSc005.setUnitWt(dbSc004.getUnitWt());
 		newSc005.setTotalWt(dbSc004.getTotalWt());
 		newSc005.setFilePath1(dbSc004.getFilePath1());

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006.java

@@ -23,6 +23,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceBase;
 import com.baosight.iplat4j.core.util.NumberUtils;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
@@ -78,7 +79,19 @@ public class ServiceHPSC006 extends ServiceBase {
         EiBlock eiBlock = outInfo.addBlock("result");
         HashMap params = new HashMap();
         params.put("productionOrderNo",inInfo.get("productionOrderNo"));
-        List list = dao.query("HPSC006.queryDetail",params,0,-999999);
+        List<HPSC006> list = dao.query("HPSC006.queryDetail",params,0,-999999);
+        if (!CollectionUtils.isEmpty(list)) {
+            for (int i = 0; i < list.size(); i++) {
+                HPSC006 hpsc006 = list.get(i);
+                String projCode = hpsc006.getProjCode();
+                if (StringUtils.isNotBlank(projCode)) {
+                    Map map = new HashMap();
+                    map.put("projCode", projCode);
+                    int reqNum = dao.count("HPKC002.countNumByProjCode",map);
+                    hpsc006.setReqNum(reqNum);
+                }
+            }
+        }
         outInfo.addBlock("detail").addBlockMeta(HPSC006.eiMetadata);
         outInfo.addBlock("detail").addRows(list);
         outInfo.getBlock("detail").set("limit", list.size());

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006C.java

+package com.baosight.hpjx.hp.sc.service;
+
+import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.common.HPConstants;
+import com.baosight.hpjx.common.InventTypeEnum;
+import com.baosight.hpjx.core.constant.CommonConstant;
+import com.baosight.hpjx.hp.kc.domain.HPKC002;
+import com.baosight.hpjx.hp.kc.domain.HPKC010;
+import com.baosight.hpjx.hp.sc.domain.HPSC006;
+import com.baosight.hpjx.hp.sc.tools.HPSCTools;
+import com.baosight.hpjx.util.*;
+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.service.impl.ServiceBase;
+import org.apache.commons.collections.MapUtils;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ */
+public class ServiceHPSC006C extends ServiceBase {
+
+    // 指定存货类型
+    private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
+            InventTypeEnum.CONSUMABLE.getCode()};
+    /**
+     * 初始化
+     *
+     * @param inInfo
+     * @return
+     */
+    @Override
+    @OperationLogAnnotation(operModul = "库存查询", operType = "查询", operDesc = "生产领料单-库存查询-初始化")
+    public EiInfo initLoad(EiInfo inInfo) {
+        try {
+            Map queryMap = new HashMap();
+            queryMap.put("inventTypes", DEFAULT_INVENT_CODE);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), queryMap, false);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
+            inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC002().eiMetadata);
+        } catch (Exception e) {
+            LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+        }
+        return inInfo;
+    }
+
+    /**
+     * 查询数据列表
+     *
+     * @param inInfo
+     * @return
+     */
+    @Override
+    @OperationLogAnnotation(operModul = "库存查询", operType = "查询", operDesc = "生产领料单-库存查询-查询")
+    public EiInfo query(EiInfo inInfo) {
+        try {
+            Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+            String receiptDate = MapUtils.getString(queryRow, "receiptDate");
+            queryRow.put("receiptDate", StringUtil.removeSpecifiedCharacter(receiptDate,
+                    StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED));
+            queryRow.put("inventTypes", DEFAULT_INVENT_CODE);
+            inInfo = super.query(inInfo, HPKC002.QUERY, new HPKC002());
+        } catch (Exception e) {
+            LogUtils.setDetailMsg(inInfo, e, "查询失败");
+        }
+        return inInfo;
+    }
+
+
+
+}

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

@@ -28,6 +28,7 @@
 	</EF:EFRegion>
 
 	<EF:EFRegion id="result" title="记录集">
+		<EF:EFInput ename="inqu_result-0-projCode" type="hidden"/>
 		<EF:EFGrid blockId="result" autoDraw="override" autoFit="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="库存ID" enable="false" width="60" align="center"/>
 			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">

src/main/webapp/HP/SC/HPSC002.jsp

@@ -49,19 +49,19 @@
 	                <EF:EFColumn ename="projName" cname="项目名称" enable="false" hidden="true"/>
 	                <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/>
 	                <EF:EFComboColumn ename="prdtType" cname="部件类型" align="center" required="true"
-	                                  filter="contains" width="90" enable="false">
+	                                  filter="contains" width="90" enable="false" hidden="true">
 		                <EF:EFOptions blockId="codeset_code_block_id" valueField="valueField" textField="textField"/>
 	                </EF:EFComboColumn>
 	                <EF:EFColumn ename="prdtCode" cname="部件编码" hidden='true'/>
 	                <EF:EFColumn ename="prdtName" cname="部件名称" width="140" align="center" maxLength="50"
 	                             required="true"/>
-	                <EF:EFColumn ename="length" cname="长" width="80" format="{0:N3}" maxLength="12" displayType="0.000"
+	                <EF:EFColumn ename="length" cname="长(MM)" width="80" format="{0:N3}" maxLength="12" displayType="0.000"
 	                             data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
 	                             data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
-	                <EF:EFColumn ename="width" cname="宽" width="80" format="{0:N3}" maxLength="12" displayType="0.000"
+	                <EF:EFColumn ename="width" cname="宽(MM)" width="80" format="{0:N3}" maxLength="12" displayType="0.000"
 	                             data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
 	                             data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
-	                <EF:EFColumn ename="thick" cname="厚" width="80" format="{0:N3}" maxLength="12" displayType="0.000"
+	                <EF:EFColumn ename="thick" cname="厚(MM)" width="80" format="{0:N3}" maxLength="12" displayType="0.000"
 	                             data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
 	                             data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
                     <EF:EFColumn enable="false" ename="parentId" hidden="true" cname="上级部件名称"/>
@@ -70,11 +70,11 @@
 	                             data-regex="/^-?[0-9]{1,12}([.][0-9]{1,3})?$/"
 	                             data-errorprompt="请输入数字，该值最大可设置12位整数和3位小数！"
 	                             required="true"/>
-	                <EF:EFColumn ename="unitWt" format="{0:N3}" cname="单重" maxLength="15" displayType="0.000"
+	                <EF:EFColumn ename="unitWt" format="{0:N3}" cname="单重(T)" maxLength="15" displayType="0.000"
 	                             data-regex="/^-?[0-9]{1,12}([.][0-9]{1,3})?$/"
 	                             data-errorprompt="请输入数字，该值最大可设置12位整数和3位小数！"
 	                             required="true"/>
-	                <EF:EFColumn ename="totalWt" cname="总重" enable="false" width="100" align="right" format="{0:N3}"/>
+	                <EF:EFColumn ename="totalWt" cname="总重(T)" enable="false" width="100" align="right" format="{0:N3}"/>
 	                <EF:EFComboColumn enable="false" ename="status" align="center"
 	                                  columnTemplate="#=textField#" optionLabel=" "
                                       itemTemplate="#=textField#" textField="textField"

src/main/webapp/HP/SC/HPSC003.jsp

@@ -35,7 +35,7 @@
             </EF:EFComboColumn>
             <EF:EFColumn enable="false" ename="prdtCode" cname="部件编码" readonly="true" hidden = "true" />
             <EF:EFColumn enable="false" ename="prdtName" cname="部件名称" readonly="true" width="120"/>
-            <EF:EFColumn enable="false" ename="spec"  cname="规格" readonly="true" align="center" width="100"/>
+            <EF:EFColumn enable="false" ename="spec"  cname="规格" readonly="true" align="center" width="100" hidden="true"/>
             <EF:EFColumn enable="false" ename="remark" cname="备注" readonly="true" width="100"/>
 	        <EF:EFColumn ename="planCompletionDate" cname="计划完成日期" width="100" editType="date"
 	                     dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required='true'/>
@@ -60,11 +60,11 @@
             </EF:EFComboColumn>
             <EF:EFColumn enable="false" ename="prdtCode"  cname="零件编码" hidden = "true"/>
             <EF:EFColumn enable="false" ename="prdtName" readonly="true" cname="零件名称"/>
-            <EF:EFColumn enable="false" ename="spec"  cname="规格" align="center" readonly="true"/>
+            <EF:EFColumn enable="false" ename="spec"  cname="规格(MM)" align="center" readonly="true"/>
             <EF:EFColumn enable="false" ename="remark" cname="备注" readonly="true"/>
             <EF:EFColumn enable="false" ename="num" readonly="true" width="80" align="right" cname="数量" format="{0:N0}"/>
-	        <EF:EFColumn enable="false" ename="unitWt" readonly="true" width="80" align="right" cname="单重"/>
-	        <EF:EFColumn ename="totalWt" cname="总重" width="80" align="right" enable="false"/>
+	        <EF:EFColumn enable="false" ename="unitWt" readonly="true" width="80" align="right" cname="单重(T)"/>
+	        <EF:EFColumn ename="totalWt" cname="总重(T)" width="80" align="right" enable="false"/>
 	        <EF:EFColumn ename="planCommentDate" required='true' cname="计划开始时间" width="100" editType="date"
 	                     dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
 	        <EF:EFColumn ename="planCompletionDate" required='true' cname="计划结束时间" width="100" editType="date"
@@ -72,7 +72,7 @@
 	        <EF:EFColumn ename="actualCompletionDate" cname="完成时间" editType="date" dateFormat="yyyy/MM/dd" width="100"
 	                     enable="false"/>
             <EF:EFColumn enable="false" ename="actualCompletionNum" width="80"  align="right" cname="完成数量" readonly="true"/>
-            <EF:EFColumn enable="false" ename="actualCompletionUnitWt" width="80" align="right" cname="完成总重" readonly="true"/>
+            <EF:EFColumn enable="false" ename="actualCompletionUnitWt" width="80" align="right" cname="完成总重(T)" readonly="true"/>
         </EF:EFGrid>
     </EF:EFRegion>
 </EF:EFPage>

src/main/webapp/HP/SC/HPSC005.jsp

@@ -38,13 +38,13 @@
 			<EF:EFColumn ename="prdtName" cname="部件名称" enable="false" width="120" align="center"/>
 			<%--<EF:EFColumn ename="prdtSpec" cname="部件规格" enable="false" width="120" align="center"/>--%>
 			<EF:EFColumn ename="partName" cname="零件名称" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="partSpec" cname="零件规格" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="partSpec" cname="零件规格(MM)" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" enable="false" width="100" align="center"
 			             editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
 			<EF:EFColumn ename="assignedNum" cname="派工数量" enable="false" width="80" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="unassignedNum" cname="剩余数量" enable="false" width="80" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="num" cname="数量" enable="false" width="80" align="right" format="{0:N0}"/>
-			<EF:EFColumn ename="totalWt" cname="重量" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="totalWt" cname="重量(T)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<%--<EF:EFColumn ename="remark" cname="部件备注" enable="false"/>--%>
 			<EF:EFColumn ename="remark1" cname="零件备注" enable="false"/>
 			<EF:EFColumn ename="projCode" cname="项目号" enable="false" width="100" align="center" hidden="true"/>

src/main/webapp/HP/SC/HPSC005A.jsp

@@ -20,7 +20,7 @@
 		</div>
 		<div class="row">
 			<EF:EFInput ename="detail-0-num" cname="计划数量" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-totalWt" cname="计划重量" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-totalWt" cname="计划重量(T)" colWidth="4" readonly="true"/>
 			<EF:EFInput ename="detail-0-assignedNum" cname="已派工数量" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
@@ -56,7 +56,7 @@
 			<%--<EF:EFColumn ename="factoryCode" cname="厂区编码" enable="false" hidden="true"/>
 			<EF:EFColumn ename="factoryName" cname="厂区" enable="false" align="center"/>--%>
 			<EF:EFColumn ename="num" cname="分派数量" format="{0:N0}" required="true"/>
-			<EF:EFColumn ename="totalWt" cname="分派重量" enable="false" format="{0:N3}"/>
+			<EF:EFColumn ename="totalWt" cname="分派重量(T)" enable="false" format="{0:N3}"/>
 			<EF:EFColumn ename="completeNum" cname="已完工数量" enable="false" format="{0:N0}"/>
 		</EF:EFGrid>
 		<br/>

src/main/webapp/HP/SC/HPSC005B.jsp

@@ -35,14 +35,14 @@
 			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="prdtName" cname="部件名称" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="partName" cname="零件名称" enable="false" width="100" align="center"/>
-			<EF:EFColumn ename="partSpec" cname="零件规格" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="partSpec" cname="零件规格(MM)" enable="false" width="100" align="center"/>
 			<%--<EF:EFColumn ename="remark1" cname="零件备注"/>--%>
 			<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" enable="false" width="120" align="center"
 			             editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
 			<EF:EFColumn ename="completeNum" cname="完成数量" enable="false" width="100" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="unCompleteNum" cname="剩余数量" enable="false" width="100" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="num" cname="数量" enable="false" width="100" align="right" format="{0:N0}"/>
-			<EF:EFColumn ename="totalWt" cname="重量" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="totalWt" cname="重量(T)" enable="false" width="100" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="orgName" cname="生产组名称" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="prodOrderNo" cname="生产订单号" enable="false" width="140" align="center" hidden="true"/>

src/main/webapp/HP/SC/HPSC005C.jsp

@@ -15,13 +15,13 @@
 		</div>
 		<div class="row">
 			<EF:EFInput ename="detail-0-prdtName" cname="部件名称" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-prdtLength" cname="部件长" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-prdtWidth" cname="部件宽" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-prdtLength" cname="部件长(MM)" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-prdtWidth" cname="部件宽(MM)" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
-			<EF:EFInput ename="detail-0-prdtThick" cname="部件厚" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-prdtThick" cname="部件厚(MM)" colWidth="4" readonly="true"/>
 			<EF:EFInput ename="detail-0-num" cname="部件数量" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-unitWt" cname="部件重量" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-unitWt" cname="部件重量(T)" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
 			<EF:EFInput ename="detail-0-remark" cname="部件备注" colWidth="4" readonly="true"/>
@@ -31,24 +31,24 @@
 			<EF:EFInput ename="detail-0-partName" cname="零件名称" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
-			<EF:EFInput ename="detail-0-partLength" cname="零件长" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-partWidth" cname="零件宽" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-partThick" cname="零件厚" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-partLength" cname="零件长(MM)" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-partWidth" cname="零件宽(MM)" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-partThick" cname="零件厚(MM)" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
 			<EF:EFInput ename="detail-0-remark1" cname="零件备注" colWidth="4" readonly="true"/>
 			<EF:EFInput ename="detail-0-num" cname="零件数量" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-unitWt" cname="零件重量" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-unitWt" cname="零件重量(T)" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
 			<EF:EFInput ename="detail-0-assignedNum" cname="派工数量" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-totalWt" cname="派工重量" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-totalWt" cname="派工重量(T)" colWidth="4" readonly="true"/>
 			<EF:EFInput ename="detail-0-unassignedNum" cname="剩余数量" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
-			<EF:EFInput ename="detail-0-unTotalWt" cname="剩余重量" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-unTotalWt" cname="剩余重量(T)" colWidth="4" readonly="true"/>
 			<EF:EFInput ename="detail-0-completeNum" cname="完成数量" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完成重量" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完成重量(T)" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
 			<EF:EFDatePicker ename="detail-0-planCompletionDate" cname="计划完成日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />

src/main/webapp/HP/SC/HPSC005D.jsp

@@ -18,13 +18,13 @@
 		</div>
 		<div class="row">
 			<EF:EFInput cname="零件名称" blockId="result" ename="partName" row="0" colWidth="4" readonly="true"/>
-			<EF:EFInput cname="零件规格" blockId="result" ename="partSpec" row="0" colWidth="4" readonly="true"/>
-			<EF:EFInput cname="重量" blockId="result" ename="totalWt" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="零件规格(MM)" blockId="result" ename="partSpec" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="重量(T)" blockId="result" ename="totalWt" row="0" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
-			<EF:EFInput cname="零件长" blockId="result" ename="partLength" row="0" colWidth="4" readonly="true"/>
-			<EF:EFInput cname="零件宽" blockId="result" ename="partWidth" row="0" colWidth="4" readonly="true"/>
-			<EF:EFInput cname="零件厚" blockId="result" ename="partThick" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="零件长(MM)" blockId="result" ename="partLength" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="零件宽(MM)" blockId="result" ename="partWidth" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="零件厚(MM)" blockId="result" ename="partThick" row="0" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
 			<EF:EFInput cname="完成数量" blockId="result" ename="completeNum" row="0" colWidth="4" readonly="true"/>

src/main/webapp/HP/SC/HPSC006.js

@@ -98,13 +98,18 @@ $(function () {
                     template: function (item) {
                         let filePath1 = item.id;
                         let status = item.status;
+                        let projCode = item.projCode;
                         let template = '';
+                        if (filePath1) {
                             template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
                                 + 'onclick="showUploadFile(' + filePath1 + ')"  >附件清单</a>';
                             if (status >= 1) {
                                 template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
                                     + 'onclick="checkIn(' + filePath1 + ')"  >登记</a>';
                             }
+                            template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                                + 'onclick="selectStock(\'' + projCode + '\')"  >领料</a>';
+                        }
                         return template
 
                     }
@@ -174,6 +179,18 @@ $(function () {
                         inInfo.set("field", options.field);
                         refreshSelect(container, inInfo);
                     }
+                },
+                {
+                    field: "reqNum",
+                    template: function (item) {
+                        let reqNum = item.reqNum;
+                        let projCode = item.projCode;
+                        let template = '';
+                        template += '<a style="cursor: pointer;display: inline-flex" '
+                            +' onclick="reqDetails(\'' + projCode + '\')"  >' + reqNum + '</a>';
+                        return template
+                    }
+
                 }
             ],
             onSuccess: function (e) {
@@ -281,6 +298,18 @@ $(window).load(function () {
     }, {async: false});
 });
 
+/**
+ * 领料详情
+ * @param projCode
+ */
+function reqDetails(projCode) {
+    JSColorbox.open({
+        href: "HPSC006C?methodName=initLoad&inqu_status-0-projCode=" + projCode,
+        title: "<div style='text-align: center;'>领料记录</div>",
+        width: "80%",
+        height: "90%"
+    });
+}
 function showUploadFile(id) {
     JSColorbox.open({
         href: "HPSC002A?methodName=initLoad&inqu_status-0-bizType=XL&inqu_status-0-id=" + id,
@@ -302,6 +331,25 @@ function checkIn(id) {
 checkInCallback = function () {
 
 }
+let selectStock = function (projCode) {
+    JSColorbox.open({
+        href: "HPKC002A?methodName=initLoad&inqu_status-0-projCode=" + projCode,
+        title: "<div style='text-align: center;'>库存查询</div>",
+        width: "90%",
+        height: "80%",
+        callbackName: selectStockCallback
+    });
+}
+
+/**
+ * 挑选库存回调
+ */
+let selectStockCallback = function () {
+    // 刷新页面
+    query();
+    // 关闭弹窗
+    JSColorbox.close();
+}
 assignCallback = function (id) {
     var info = new EiInfo()
     info.set("ids",ids.join(','));

src/main/webapp/HP/SC/HPSC006.jsp

@@ -46,6 +46,8 @@
         <EF:EFGrid blockId="detail" autoDraw="no">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn ename="operator" cname="操作" width="140"  enable="false" readonly="false"/>
+            <EF:EFColumn enable="false" ename="reqNum" cname="领料记录" width="80" align="center" readonly="true"/>
+
 <%--        <EF:EFComboColumn cname="材料类型" ename="inventType" width="80" align="center" required="true" >--%>
 <%--               <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('7')"/>--%>
 <%--         </EF:EFComboColumn>--%>
@@ -58,13 +60,13 @@
                               valueField="textField" textField="textField"/>--%>
             <EF:EFColumn ename="inventName" cname="材料名称" width="200" align="center"  required="true" maxLength="50"/>
             <EF:EFColumn ename="inventCode" enable="false" cname="材料编码" hidden="true"/>
-            <EF:EFColumn ename="inventLength" width="80" cname="长" format="{0:N3}" maxLength="12" displayType="0.000"
+            <EF:EFColumn ename="inventLength" width="80" cname="长(MM)" format="{0:N3}" maxLength="12" displayType="0.000"
                          data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
                          data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
-            <EF:EFColumn ename="inventWidth" width="80" cname="宽" format="{0:N3}" maxLength="12" displayType="0.000"
+            <EF:EFColumn ename="inventWidth" width="80" cname="宽(MM)" format="{0:N3}" maxLength="12" displayType="0.000"
                          data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
                          data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
-            <EF:EFColumn ename="inventThick" width="80" cname="厚" format="{0:N3}" maxLength="12" displayType="0.000"
+            <EF:EFColumn ename="inventThick" width="80" cname="厚(MM)" format="{0:N3}" maxLength="12" displayType="0.000"
                          data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
                          data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
             <EF:EFColumn ename="material" width="80" cname="材质" />
@@ -72,7 +74,7 @@
             <EF:EFColumn ename="num" width="80" cname="数量" maxLength="12" displayType="0.000"
                          data-regex="/^-?[0-9]{1,9}$/"
                          data-errorprompt="请输入数字，该值最大可设置9位整数！"/>
-            <EF:EFColumn ename="unitWt" format="{0:N3}" width="80" cname="单重" maxLength="12" displayType="0.000"
+            <EF:EFColumn ename="unitWt" format="{0:N3}" width="80" cname="单重(T)" maxLength="12" displayType="0.000"
                          data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
                          data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
             <EF:EFColumn enable="false" format="{0:N3}" ename="totalWt" width="80" maxLength="12" displayType="0.000" cname="总重"/>
@@ -86,7 +88,7 @@
             <EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" width="120" enable="false"/>
             <EF:EFColumn enable="false" ename="actualCompletionNum" cname="实际完工数量" width="100" readonly="true"/>
-            <EF:EFColumn enable="false" ename="actualCompletionTotalWt" cname="实际完工重量" width="100" readonly="true"/>
+            <EF:EFColumn enable="false" ename="actualCompletionTotalWt" cname="实际完工重量（T)" width="100" readonly="true"/>
             <EF:EFComboColumn enable="false" align="center" ename="status" width="80" cname="状态">
                 <EF:EFOption label="计划中" value="0"/>
                 <EF:EFOption label="生产中" value="1"/>

src/main/webapp/HP/SC/HPSC006B.jsp

@@ -22,22 +22,22 @@
 		</div>
 		<div class="row">
 			<EF:EFInput ename="detail-0-inventName" cname="材料名称" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-inventLength" cname="长" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-inventWidth" cname="宽" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-inventLength" cname="长(MM)" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-inventWidth" cname="宽(MM)" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
-			<EF:EFInput ename="detail-0-inventThick" cname="厚" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-inventSpec" cname="材料规格" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-inventThick" cname="厚(MM)" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-inventSpec" cname="材料规格(MM)" colWidth="4" readonly="true"/>
 			<EF:EFInput ename="detail-0-material" cname="材质" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
 			<EF:EFInput ename="detail-0-num" cname="计划数量" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-unitWt" cname="计划单重" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-totalWt" cname="计划重量" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-unitWt" cname="计划单重(T)" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-totalWt" cname="计划重量(T)" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
 			<EF:EFInput ename="detail-0-actualCompletionNum" cname="完成数量" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完成重量" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完成重量(T)" colWidth="4" readonly="true"/>
 			<EF:EFInput ename="detail-0-cutSchedule" cname="下料进度" format="{0:N2}" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">

src/main/webapp/HP/SC/HPSC006C.js

+$(function () {
+	IPLATUI.EFGrid = {
+		"result": {
+			columns: [],
+			dataBound: function () {
+			}
+		}
+	};
+
+	$("#ef_form_head").hide();
+
+	// 查询
+	$("#QUERY").on("click", query);
+
+
+});
+
+/**
+ * 页面加载时执行
+ */
+$(window).load(function () {
+	// 初始化查询
+	query();
+});
+
+/**
+ * 查询
+ */
+var query = function (e) {
+	resultGrid.dataSource.page(1);
+};
+

src/main/webapp/HP/SC/HPSC006C.jsp

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ 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-projCode" colWidth="3" readonly="true"/>
+			<EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3" format="yyyy-MM-dd"
+							 readonly="true"/>
+			<EF:EFInput cname="领料单号" ename="inqu_status-0-reqNo" colWidth="3"/>
+			<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>
+		<div class="row">
+			<EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFSelect cname="规格" ename="inqu_status-0-spec" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+		</div>
+		<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>
+		</div>
+	</EF:EFRegion>
+
+	<EF:EFRegion id="result" title="明细信息">
+		<EF:EFGrid blockId="result" autoDraw="override" autoFit="true" isFloat="true" checkMode="row">
+			<EF:EFColumn ename="id" cname="主键id" hidden="true"/>
+			<EF:EFColumn ename="projCode" cname="项目编码" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="reqNo" cname="领料单号" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="receiptDate" cname="单据日期" enable="false" width="90" align="center"
+						 editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
+			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
+				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
+			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="whCode" cname="仓库编码" enable="false" width="120" align="center"
+							  blockName="wh_record_block_id" textField="textField" valueField="valueField"
+							  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="inventCode" cname="存货名称" enable="false" width="120" align="center"
+							  blockName="invent_name_block_id" textField="textField" valueField="valueField"
+							  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="inventRecordId" cname="规格" enable="false" width="120" align="center"
+							  blockName="invent_spec_block_id" textField="textField" valueField="valueField"
+							  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
+			<EF:EFColumn ename="amount" cname="数量" enable="false" format="{0:N0}" maxLength="20" width="100"
+						 align="right"/>
+			<EF:EFColumn ename="unitWeight" cname="单重" enable="false" format="{0:N3}" maxLength="20" width="100"
+						 align="right"/>
+			<EF:EFColumn ename="weight" cname="重量" enable="false" format="{0:N3}" maxLength="20" width="100"
+						 align="right"/>
+			<EF:EFColumn ename="remark" cname="备注" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="oldReqNo" cname="原领料单号" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"
+						 editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
+		</EF:EFGrid>
+	</EF:EFRegion>
+</EF:EFPage>

src/main/webapp/HP/SC/HPSC007.jsp

@@ -21,12 +21,12 @@
 		</div>
 		<div class="row">
 			<EF:EFInput ename="detail-0-num" cname="计划数量" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-unitWt" cname="单重" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-totalWt" cname="计划重量" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-unitWt" cname="单重(T)" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-totalWt" cname="计划重量(T)" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
 			<EF:EFInput ename="detail-0-actualCompletionNum" cname="完工数量" colWidth="4" readonly="true"/>
-			<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完工重量" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完工重量(T)" colWidth="4" readonly="true"/>
 			<EF:EFDatePicker cname="计划完成日期" ename="detail-0-planCompletionDate"  row="0" colWidth="4"
 							 format="yyyy-MM-dd" readonly="true"/>
 		</div>
@@ -53,7 +53,7 @@
 			<EF:EFColumn ename="actualCompletionNum" cname="完成数量" format="{0:N3}" maxLength="12" displayType="0.000"
 						 data-regex="/^-?[0-9]{1,9}$/"
 						 data-errorprompt="请输入数字，该值最大可设置9位整数！"/>
-			<EF:EFColumn ename="actualCompletionTotalWt" cname="完成重量" enable="false" format="{0:N3}" maxLength="12" displayType="0.000"
+			<EF:EFColumn ename="actualCompletionTotalWt" cname="完成重量(T)" enable="false" format="{0:N3}" maxLength="12" displayType="0.000"
 						 data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
 						 data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
 		</EF:EFGrid>