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

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

@@ -182,7 +182,9 @@ $(function () {
                         item['prdtType'] = 3;
                     }
                     //item['id'] = null
+                    item['status'] = 0;
                 });
+
             },
             /**
              * 点击Grid保存按钮时触发的事件
@@ -792,8 +794,8 @@ function saveFunc() {
             flag = false;
             return;
         }
-        if(isBlank(unitWt)){
-            message("选中的第"+(index+1)+"行\"单重\"，不能为空!");
+        if(!isPositiveNumber(unitWt)){
+            message("选中的第"+(index+1)+"行\"单重\"必须是大于0的数");
             flag = false;
             return false;
         }

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

@@ -43,7 +43,7 @@
             <EF:EFRegion id="result" title="明细信息">
                 <EF:EFGrid blockId="result" autoDraw="override">
                     <EF:EFColumn ename="id" cname="主键" hidden="true"/>
-	                <EF:EFColumn ename="level" cname="层级" hidden="true"/>
+	                <EF:EFColumn ename="lv" cname="层级" hidden="true"/>
                     <EF:EFColumn enable="false" ename="pgStatus" hidden="true" cname="派工状态"/>
 	                <EF:EFColumn ename="projCode" cname="项目编码" enable="false" hidden="true"/>
 	                <EF:EFColumn ename="projName" cname="项目名称" enable="false" hidden="true"/>
@@ -69,13 +69,11 @@
                     <EF:EFColumn enable="false" ename="parentPrdtName" hidden="true" cname="上级部件名称"/>
 	                <EF:EFColumn ename="num" cname="数量" maxLength="15" displayType="0.000" format="{0:N0}"
 	                             data-regex="/^-?[0-9]{1,12}([.][0-9]{1,3})?$/"
-	                             data-errorprompt="请输入数字，该值最大可设置12位整数和3位小数！"
-	                             required="true"/>
-	                <EF:EFColumn ename="unitWt" format="{0:N3}" cname="单重(T)" maxLength="15" displayType="0.000"
+	                             data-errorprompt="请输入数字，该值最大可设置12位整数和3位小数！"/>
+	                <EF:EFColumn ename="unitWt" format="{0:N3}" cname="单重(KG)" 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="总重(T)" enable="false" width="100" align="right" format="{0:N3}"/>
+	                             data-errorprompt="请输入数字，该值最大可设置12位整数和3位小数！"/>
+	                <EF:EFColumn ename="totalWt" cname="总重(KG)" 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

@@ -67,11 +67,11 @@
             <EF:EFColumn enable="false" ename="spec"  cname="规格" 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="单重(T)"/>
-	        <EF:EFColumn ename="totalWt" cname="总重(T)" width="80" align="right" enable="false"/>
+	        <EF:EFColumn enable="false" ename="unitWt" readonly="true" width="80" align="right" cname="单重(KG)"/>
+	        <EF:EFColumn ename="totalWt" cname="总重(KG)" 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"
+	        <EF:EFColumn ename="planCompletionDate" required='true' cname="计划完成日期" width="100" editType="date"
 	                     dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
 	        <EF:EFColumn ename="actualCompletionDate" cname="完成时间" editType="date" dateFormat="yyyy/MM/dd" width="100"
 	                     enable="false"/>

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

@@ -50,7 +50,7 @@
 			<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="总重(T)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="totalWt" cname="总重(KG)" 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/HPSC005B.jsp

@@ -46,7 +46,7 @@
 			<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="总重(T)" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="totalWt" cname="总重(KG)" 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"/>