2024-08-07 生产计划和生产订单显示调整，生产任务和生产报工添加工序和规格， 整改通知单添加工序字段

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

@@ -331,6 +331,8 @@ public enum DdynamicEnum {
      */
     PLAN_PROCESS_BLOCK_ID("plan_process_block_id", "processName", "processName", "HGSC005A.queryProcessComboBox"),
 
+    ORDER_CODE_BLOCK_ID("order_code_block_id", "processName", "processName", "HGSC006A.queryOrderCodeBox"),
+
 
     /**
      * 合同

src/main/java/com/baosight/hggp/hg/sc/domain/HGSC007.java

@@ -64,6 +64,8 @@ public class HGSC007 extends DaoEPBase {
 	public static final String FIELD_updated_by = "updatedBy";    		/* 更新人*/
 	public static final String FIELD_updated_name = "updatedName";    		/* 修改人名称*/
 	public static final String FIELD_updated_time = "updatedTime";    		/* 更新时间*/
+	public static final String FIELD_spec = "spec";    		/* 规格*/
+	public static final String FIELD_length = "length";    		/* 长*/
 
 
 	public static final String COL_id = "id";
@@ -161,7 +163,8 @@ public class HGSC007 extends DaoEPBase {
 	private String updatedBy = " ";		/* 更新人*/
 	private String updatedName = " ";		/* 修改人名称*/
 	private String updatedTime = " ";		/* 更新时间*/
-
+	private String spec = " ";		/* 规格*/
+	private BigDecimal length = new BigDecimal("0");		/* 长*/
 
 
 	/**
@@ -347,7 +350,16 @@ public class HGSC007 extends DaoEPBase {
 		eiColumn.setDescName("更新时间");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_spec);
+		eiColumn.setDescName("规格");
+		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_length);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(12);
+		eiColumn.setDescName("长");
+		eiMetadata.addMeta(eiColumn);
 
 	}
 
@@ -1015,6 +1027,21 @@ public class HGSC007 extends DaoEPBase {
 		this.updatedTime = updatedTime;
 	}
 
+	public String getSpec() {
+		return spec;
+	}
+
+	public void setSpec(String spec) {
+		this.spec = spec;
+	}
+
+	public BigDecimal getLength() {
+		return length;
+	}
+
+	public void setLength(BigDecimal length) {
+		this.length = length;
+	}
 
 	/**
 	 * get the value from Map.
@@ -1065,6 +1092,8 @@ public class HGSC007 extends DaoEPBase {
 		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_by)), updatedBy));
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_name)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_time)), updatedTime));
+		setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_spec)), spec));
+		setLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_length)), length));
 
 	}
 
@@ -1116,6 +1145,8 @@ public class HGSC007 extends DaoEPBase {
 		map.put(FIELD_updated_by, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_updated_by)));
 		map.put(FIELD_updated_name, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_updated_name)));
 		map.put(FIELD_updated_time, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_updated_time)));
+		map.put(FIELD_spec, StringUtils.toString(spec, eiMetadata.getMeta(FIELD_spec)));
+		map.put(FIELD_length, StringUtils.toString(length, eiMetadata.getMeta(FIELD_length)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/sc/domain/HGSC008.java

@@ -67,6 +67,9 @@ public class HGSC008 extends DaoEPBase {
 	public static final String FIELD_task_quantity = "taskQuantity";
 	public static final String FIELD_task_weight = "taskWeight";
 
+	public static final String FIELD_spec = "spec";    		/* 规格*/
+	public static final String FIELD_length = "length";    		/* 长*/
+
 	public static final String COL_id = "id";    		
 	public static final String COL_mat_id = "mat_id";    		/* 物料清单ID*/
 	public static final String COL_task_id = "task_id";    		/* 生产任务ID*/
@@ -148,6 +151,8 @@ public class HGSC008 extends DaoEPBase {
 	private String updatedBy = " ";		/* 更新人*/
 	private String updatedName = " ";		/* 修改人名称*/
 	private String updatedTime = " ";		/* 更新时间*/
+	private String spec = " ";		/* 规格*/
+	private BigDecimal length = new BigDecimal("0");		/* 长*/
 
 
 	//补充字段
@@ -396,6 +401,17 @@ public class HGSC008 extends DaoEPBase {
 		eiColumn.setDescName("任务重量");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_spec);
+		eiColumn.setDescName("规格");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_length);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(12);
+		eiColumn.setDescName("长");
+		eiMetadata.addMeta(eiColumn);
+
 //		private Integer registeredQuantity = new Integer(0);
 //		private BigDecimal registeredWeight = new BigDecimal(0);
 //		private Integer unregisterQuantity = new Integer(0);
@@ -986,6 +1002,23 @@ public class HGSC008 extends DaoEPBase {
 	public void setUpdatedTime(String updatedTime) {
 		this.updatedTime = updatedTime;
 	}
+
+	public String getSpec() {
+		return spec;
+	}
+
+	public void setSpec(String spec) {
+		this.spec = spec;
+	}
+
+	public BigDecimal getLength() {
+		return length;
+	}
+
+	public void setLength(BigDecimal length) {
+		this.length = length;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -1037,6 +1070,8 @@ public class HGSC008 extends DaoEPBase {
 		setUnregisterWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_unregister_weight)), unregisterWeight));
 		setTaskQuantity(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_task_quantity)), taskQuantity));
 		setTaskWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_task_weight)), taskWeight));
+		setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_spec)), spec));
+		setLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_length)), length));
 	}
 
 	/**
@@ -1088,6 +1123,8 @@ public class HGSC008 extends DaoEPBase {
 		map.put(FIELD_unregister_weight, StringUtils.toString(unregisterWeight, eiMetadata.getMeta(FIELD_unregister_weight)));
 		map.put(FIELD_task_quantity, StringUtils.toString(taskQuantity, eiMetadata.getMeta(FIELD_task_quantity)));
 		map.put(FIELD_task_weight, StringUtils.toString(taskWeight, eiMetadata.getMeta(FIELD_task_weight)));
+		map.put(FIELD_spec, StringUtils.toString(spec, eiMetadata.getMeta(FIELD_spec)));
+		map.put(FIELD_length, StringUtils.toString(length, eiMetadata.getMeta(FIELD_length)));
 		return map;
 	}
 }

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC006A.java

@@ -2,14 +2,17 @@ package com.baosight.hggp.hg.sc.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.AssignStatusEnum;
+import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.sc.domain.HGSC005A;
 import com.baosight.hggp.hg.sc.domain.HGSC006;
 import com.baosight.hggp.hg.sc.domain.HGSC006A;
 import com.baosight.hggp.hg.sc.domain.HGSC007;
 import com.baosight.hggp.hg.sc.tools.HGSCTools;
 import com.baosight.hggp.util.AssertUtils;
 import com.baosight.hggp.util.BeanUtils;
+import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
@@ -18,6 +21,8 @@ import com.baosight.iplat4j.core.service.impl.ServiceBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
 import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.HashMap;
 
 
 /**
@@ -29,7 +34,11 @@ public class ServiceHGSC006A extends ServiceBase {
     @OperationLogAnnotation(operModul = "生产订单详情", operType = "查询", operDesc = "初始化页面")
     public EiInfo initLoad(EiInfo inInfo) {
         try {
+            String orderCode = inInfo.getCellStr(EiConstant.queryBlock,0,HGSC006A.FIELD_order_code);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGSC006A().eiMetadata);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.ORDER_CODE_BLOCK_ID), new HashMap<String, Object>(){{
+                put(HGSC006A.FIELD_order_code,orderCode);
+            }},false);
 //            inInfo = super.query(inInfo, HGSC006A.QUERY, new HGSC006A());
         } catch (PlatException e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC005A.xml

@@ -101,10 +101,10 @@
 			finish_date = #finishDate#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="planStartDate">
-			plan_start_date = #planStartDate#
+			plan_start_date >= #planStartDate#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="planEndDate">
-			plan_end_date = #planEndDate#
+			plan_end_date &lt;= #planEndDate#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="quantity">
 			quantity = #quantity#

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC006A.xml

@@ -490,5 +490,16 @@
 		WHERE id = #id#
 	</update>
 
+	<select id="queryOrderCodeBox" parameterClass="java.util.HashMap"
+			resultClass="java.util.HashMap">
+		SELECT DISTINCT
+		process_name as "processName"
+		FROM ${hggpSchema}.HGSC006A
+		WHERE order_code = #orderCode#
+		<isNotEmpty prepend=" AND " property="accountCode">
+			ACCOUNT_CODE = #accountCode#
+		</isNotEmpty>
+		ORDER BY process_name
+	</select>
 
 </sqlMap>

src/main/java/com/baosight/hggp/hg/zl/domain/HGZL004.java

@@ -53,6 +53,8 @@ public class HGZL004 extends DaoEPBase {
 	public static final String FIELD_updated_by = "updatedBy";    		/* 更新人*/
 	public static final String FIELD_updated_name = "updatedName";    		/* 修改人名称*/
 	public static final String FIELD_updated_time = "updatedTime";    		/* 更新时间*/
+	public static final String FIELD_process_code = "processCode";    		/* 工序编码*/
+	public static final String FIELD_process_name = "processName";    		/* 工序名称*/
 
 	public static final String COL_id = "id";    		
 	public static final String COL_check_id = "check_id";    		/* 质检单ID*/
@@ -130,6 +132,8 @@ public class HGZL004 extends DaoEPBase {
 	private String updatedBy = " ";		/* 更新人*/
 	private String updatedName = " ";		/* 修改人名称*/
 	private String updatedTime = " ";		/* 更新时间*/
+	private String processCode = " ";		/* 工序编码*/
+	private String processName = " ";		/* 工序名称*/
 
 	/**
 	 * initialize the metadata.
@@ -266,7 +270,13 @@ public class HGZL004 extends DaoEPBase {
 		eiColumn.setDescName("更新时间");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_process_code);
+		eiColumn.setDescName("工序编码");
+		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_process_name);
+		eiColumn.setDescName("工序名称");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -788,6 +798,23 @@ public class HGZL004 extends DaoEPBase {
 	public void setUpdatedTime(String updatedTime) {
 		this.updatedTime = updatedTime;
 	}
+
+	public String getProcessCode() {
+		return processCode;
+	}
+
+	public void setProcessCode(String processCode) {
+		this.processCode = processCode;
+	}
+
+	public String getProcessName() {
+		return processName;
+	}
+
+	public void setProcessName(String processName) {
+		this.processName = processName;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -828,6 +855,8 @@ public class HGZL004 extends DaoEPBase {
 		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_by)), updatedBy));
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_name)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_time)), updatedTime));
+		setProcessCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_process_code)), processCode));
+		setProcessName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_process_name)), processName));
 	}
 
 	/**
@@ -869,6 +898,8 @@ public class HGZL004 extends DaoEPBase {
 		map.put(FIELD_updated_by, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_updated_by)));
 		map.put(FIELD_updated_name, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_updated_name)));
 		map.put(FIELD_updated_time, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_updated_time)));
+		map.put(FIELD_process_code, StringUtils.toString(processCode, eiMetadata.getMeta(FIELD_process_code)));
+		map.put(FIELD_process_name, StringUtils.toString(processName, eiMetadata.getMeta(FIELD_process_name)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/zl/sql/HGZL004.xml

@@ -144,6 +144,12 @@
 		<isNotEmpty prepend=" AND " property="ids">
 			id IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="processCode">
+			process_code = #processCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="processName">
+			process_name = #processName#
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"
@@ -180,7 +186,9 @@
 				created_time	as "createdTime",  <!-- 创建时间 -->
 				updated_by	as "updatedBy",  <!-- 更新人 -->
 				updated_name	as "updatedName",  <!-- 修改人名称 -->
-				updated_time	as "updatedTime" <!-- 更新时间 -->
+				updated_time	as "updatedTime", <!-- 更新时间 -->
+		process_code	as "processCode",  <!-- 工序编码 -->
+		process_name	as "processName"  <!-- 工序名称 -->
 		FROM ${hggpSchema}.HGZL004 WHERE 1=1
         <include refid="condition" />
 		<dynamic prepend="ORDER BY">
@@ -330,9 +338,11 @@
 										created_time,  <!-- 创建时间 -->
 										updated_by,  <!-- 更新人 -->
 										updated_name,  <!-- 修改人名称 -->
-										updated_time  <!-- 更新时间 -->
+										updated_time,  <!-- 更新时间 -->
+		process_code,  <!-- 工序编码 -->
+		process_name  <!-- 工序名称 -->
 										)
-	    VALUES (#id#, #checkId#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #handleStatus#, #qualityProblem#, #processSugges#, #rectificatSugges#, #checkType#, #checkCode#, #productType#, #productCode#, #productName#, #factoryCode#, #factoryName#, #groupCode#, #groupName#, #workBy#, #workName#, #checkBy#, #checkName#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#)
+	    VALUES (#id#, #checkId#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #handleStatus#, #qualityProblem#, #processSugges#, #rectificatSugges#, #checkType#, #checkCode#, #productType#, #productCode#, #productName#, #factoryCode#, #factoryName#, #groupCode#, #groupName#, #workBy#, #workName#, #checkBy#, #checkName#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #processCode#, #processName#)
 	</insert>
 
 	<delete id="delete">
@@ -373,7 +383,9 @@
 					created_time	= #createdTime#,   <!-- 创建时间 -->
 					updated_by	= #updatedBy#,   <!-- 更新人 -->
 					updated_name	= #updatedName#,   <!-- 修改人名称 -->
-					updated_time	= #updatedTime#  <!-- 更新时间 -->
+					updated_time	= #updatedTime#,  <!-- 更新时间 -->
+		process_code	= #processCode#,   <!-- 工序编码 -->
+		process_name	= #processName#   <!-- 工序名称 -->
 			WHERE
 			id = #id#
 	</update>

src/main/resources/resources/ibatis/sqlmap-config.xml

@@ -56,8 +56,8 @@
     <sqlMap resource="com/baosight/hggp/hg/sc/sql/HGSC005A.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/sc/sql/HGSC006.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/sc/sql/HGSC006A.xml"/>
-    <sqlMap resource="com/baosight/hggp/hg/sc/sql/HGSC007.xml"/>
-    <sqlMap resource="com/baosight/hggp/hg/sc/sql/HGSC008.xml"/>
+    <!--<sqlMap resource="com/baosight/hggp/hg/sc/sql/HGSC007.xml"/>
+    <sqlMap resource="com/baosight/hggp/hg/sc/sql/HGSC008.xml"/>-->
     <sqlMap resource="com/baosight/hggp/hg/sc/sql/HGSC009.xml"/>
 
     <!-- 財務 -->

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

 $(function () {
 
+    $(".row").children().attr("class", "col-md-3");
+
     $("#QUERY").on("click", function () {
         resultGrid.dataSource.page(1);
     });
 
-
     IPLATUI.EFGrid.result = {
         pageable: {
             pageSize: 20,

src/main/webapp/HG/SC/HGSC005A.jsp

@@ -19,10 +19,15 @@
             <EF:EFSelect cname="工序" ename="inqu_status-0-processName" colWidth="3" filter="contains">
                 <EF:EFOptions blockId="plan_process_block_id" valueField="valueField" textField="textField"/>
             </EF:EFSelect>
+            <EF:EFDateSpan startCname="计划开工日期" endCname="计划完工日期" blockId="inqu_status"
+                           startName="planStartDate" endName="planEndDate" row="0" role="date"
+                           format="yyyy-MM-dd" satrtRatio="4:8" endRatio="4:8">
+            </EF:EFDateSpan>
             <EF:EFDatePicker cname="交货日期" ename="inqu_status-0-finishDate"  colWidth="3"
                              format="yyyy-MM-dd" readonly="false"/>
-            <EF:EFDatePicker cname="计划完工日期" ename="inqu_status-0-planEndDate"  colWidth="3"
-                             format="yyyy-MM-dd" readonly="false"/>
+
+            <%--<EF:EFDatePicker cname="计划完工日期" ename="inqu_status-0-planEndDate"  colWidth="3"
+                             format="yyyy-MM-dd" readonly="false"/>--%>
         </div>
     </EF:EFRegion>
     <EF:EFRegion id="result" title="记录集">

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

 $(function () {
 
+    $(".row").children().attr("class", "col-md-3");
+
     $("#QUERY").on("click", function () {
         resultGrid.dataSource.page(1);
     });

src/main/webapp/HG/SC/HGSC006A.jsp

@@ -17,11 +17,19 @@
             <EF:EFInput ename="inqu_status-0-productCode" cname="产品编码" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput ename="inqu_status-0-productName" cname="产品名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput ename="inqu_status-0-projName" cname="项目名称" placeholder="模糊查询" colWidth="3"/>
+            <EF:EFSelect cname="工序" ename="inqu_status-0-processName" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="order_code_block_id" valueField="valueField" textField="textField"/>
+            </EF:EFSelect>
+            <EF:EFDateSpan startCname="计划开工日期" endCname="计划完工日期" blockId="inqu_status"
+                           startName="planStartDate" endName="planEndDate" row="0" role="date"
+                           format="yyyy-MM-dd" satrtRatio="4:8" endRatio="4:8">
+            </EF:EFDateSpan>
 <%--            <EF:EFDatePicker cname="生产订单日期" ename="inqu_status-0-createdTime"  colWidth="3"--%>
 <%--                             format="yyyy-MM-dd" readonly="false"/>--%>
-            <EF:EFDatePicker cname="计划开工日期" ename="inqu_status-0-planStartDate"  colWidth="3"
+            <%--<EF:EFDatePicker cname="计划开工日期" ename="inqu_status-0-planStartDate"  colWidth="3"
                              format="yyyy-MM-dd" readonly="false"/>
-
+--%>
         </div>
     </EF:EFRegion>
     <EF:EFRegion id="result" title="记录集">

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

@@ -21,6 +21,16 @@ $(function () {
                         + 'onclick="showUploadFile(' + item.matId + ')" >附件清单</a>';
                     return template;
                 }
+            }, {
+                field: "spec",
+                template: function (options) {
+                    return $.trim(options.spec) == "" ? "无规格" : options.spec;
+                }
+            }, {
+                field: "length",
+                template: function (options) {
+                    return options.length == 0 ? "-" : options.length;
+                }
             }
         ],
         loadComplete: function(grid) {

src/main/webapp/HG/SC/HGSC007.jsp

@@ -47,6 +47,8 @@
             <EF:EFColumn ename="productName" cname="产品名称" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="processName" cname="工序" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="groupName" cname="生产班组" width="100" enable="false" readonly="true" align="center"/>
+            <EF:EFColumn ename="spec" cname="规格" width="100" align="right" format="{0:N2}" maxLength="10" enable="false"/>
+            <EF:EFColumn ename="length" cname="长(MM)" width="100" align="right" format="{0:N2}" maxLength="10" enable="false"/>
             <EF:EFColumn ename="singleWeight" cname="单重(KG)" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="totalWeight" cname="任务总重(KG)" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="finishWeight" cname="完工总重(KG)" width="100" enable="false" readonly="true" align="center"/>

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

@@ -18,6 +18,16 @@ $(function () {
                     + 'onclick="showUploadFile(' + item.id + ')" >附件清单</a>';
                 return template;
             }
+        }, {
+            field: "spec",
+            template: function (options) {
+                return $.trim(options.spec) == "" ? "无规格" : options.spec;
+            }
+        }, {
+            field: "length",
+            template: function (options) {
+                return options.length == 0 ? "-" : options.length;
+            }
         }],
         loadComplete: function(grid) {
         },

src/main/webapp/HG/SC/HGSC008.jsp

@@ -37,6 +37,8 @@
             <EF:EFColumn ename="productName" cname="产品名称" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="processName" cname="工序" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="groupName" cname="生产组" width="100" enable="false" readonly="true" align="center"/>
+            <EF:EFColumn ename="spec" cname="规格" width="100" align="right" format="{0:N2}" maxLength="10" enable="false"/>
+            <EF:EFColumn ename="length" cname="长(MM)" width="100" align="right" format="{0:N2}" maxLength="10" enable="false"/>
             <EF:EFColumn ename="quantity" cname="数量" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="singleWeight" cname="单重(KG)" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="totalWeight" cname="任务总重(KG)" width="100" enable="false" readonly="true" align="center"/>

src/main/webapp/HG/ZL/HGZL004.jsp

@@ -36,6 +36,7 @@
 			<EF:EFColumn ename="groupName" cname="责任部门" width="100" enable="false" readonly="true" align="center"/>
 			<EF:EFColumn ename="workName" cname="姓名" width="90" enable="false" readonly="true" align="center"/>
 			<EF:EFColumn ename="productName" cname="产品名称" width="90" enable="false" readonly="true" align="center"/>
+			<EF:EFColumn ename="processName" cname="工序" width="100" enable="false" readonly="true" align="center"/>
 			<EF:EFColumn ename="qualityProblem" cname="质量问题描述" width="130" align="center"/>
 			<EF:EFColumn ename="problemPic" cname="问题照片" width="90" enable="false" align="center"/>
 			<EF:EFColumn ename="processPic" cname="处理照片" width="90" enable="false" align="center"/>