Merge branch 'master' of http://gitlab.yqdchina.com/huyi/warehouse into zlt

src/main/webapp/webpage/modules/warehouse/goods/goodsForm.jsp

@@ -120,11 +120,16 @@
         if(!isValidate){
             return false;
         }else{
-            var hasDetails = getTableData().filter(function (e) { return e.delFlag != 1 }).length == 0;
+            var list = getTableData();
+            var hasDetails = list.filter(function (e) { return e.delFlag != 1 }).length === 0;
             if(hasDetails){
                 jp.warning('请填写明细!');
                 return;
             }
+            if (list.some(function (e) { return Number(e.amount) <= 0 })) {
+                jp.alert('请先设置品名代码单价');
+                return;
+            }
             jp.loading();
             jp.post($("#inputForm").attr('action'),$('#inputForm').serialize(),function(data){
                 if(data.success){

src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.js

@@ -492,7 +492,7 @@ function renderScanTable () {
             },
             {
                 field: 'code',
-                title: '入库单'
+                title: '物资编码'
             },
             {
                 field: 'batchNum',

src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeForm.jsp

@@ -49,7 +49,7 @@
                             <tr class="other-content">
                                 <td><font color="red">*</font>单价</td>
                                 <td>
-                                    <form:input path="amount" type="number" htmlEscape="false" class="form-control required isIntGteZero"/>
+                                    <form:input path="amount" type="number" htmlEscape="false" class="form-control required isIntGtZero"/>
                                 </td>
                                 <td><font color="red">*</font>单位</td>
                                 <td>