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

src/main/java/com/baosight/hpjx/hp/mt/sql/HPMT002.xml

@@ -10,6 +10,7 @@
         PROJ_TYPE as "projType",  <!-- 项目类型 -->
         PROJ_CODE as "projCode",  <!-- 项目编码 -->
         PROJ_NAME as "projName",  <!-- 项目名称 -->
+        PRDT_NAME as "prdtName",  <!-- 产品名称 -->
         PLAN_INFO_NO as "planInfoNo",  <!-- 生产计划单号 -->
         PLAN_COMPLETION_DATE as "planCompletionDate",  <!-- 计划完成日期 -->
         STATUS as "status",  <!-- 状态   0-计划中，1-生产中 -->
@@ -55,6 +56,7 @@
                 PROJ_TYPE as "projType",  <!-- 项目类型 -->
                 PROJ_CODE as "projCode",  <!-- 项目编码 -->
                 PROJ_NAME as "projName",  <!-- 项目名称 -->
+                PRDT_NAME as "prdtName",  <!-- 产品名称 -->
                 PLAN_INFO_NO as "planInfoNo",  <!-- 生产计划单号 -->
                 PLAN_COMPLETION_DATE as "planCompletionDate",  <!-- 计划完成日期 -->
                 STATUS as "status",  <!-- 状态   0-计划中，1-生产中 -->

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

@@ -127,15 +127,15 @@ function save() {
             return;
         }
         if (isBlank(rows[i]['custCode'])) {
-            message("勾选的第" + (i + 1) + "行供应商不能为空");
+            message("勾选的第" + (i + 1) + "行\"供应商\"不能为空");
             return;
         }
-        if (!isPositiveInteger(rows[i]['planAmount'])) {
-            message("勾选的第" + (index + 1) + "行\"计划数量\"必须是大于0的整数");
+        if (isBlank(rows[i]['planAmount'])) {
+            message("勾选的第" + (i + 1) + "行\"计划数量\"不能为空");
             return;
         }
-        if(!isPositiveNumber(rows[i]['planWeight'])){
-            message("选中的第"+(index+1)+"行\"计划重量\"必须是大于0的数");
+        if(isBlank(rows[i]['planWeight'])){
+            message("选中的第"+(i+1)+"行\"计划重量\"不能为空");
             return ;
         }
     }