From d8b105943c2cbde46c22fd9e0dcf4d38015a2afa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 29 Aug 2020 02:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=A8=A1=E5=9D=97=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/materials/in_out.js               | 12 ++++++++----
 .../erp/service/depotItem/DepotItemService.java    | 14 +++++++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index 0ecec9e9..f76603a3 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -2377,12 +2377,16 @@
 	    if ($('#materialData').datagrid('validateRow', editIndex)) {
 			//仓库信息
 			var edDepot = $('#materialData').datagrid('getEditor', {index:editIndex,field:'DepotId'});
-			var DepotName = $(edDepot.target).combobox('getText');
-			$('#materialData').datagrid('getRows')[editIndex]['DepotName'] = DepotName;
+			if(edDepot) {
+				var DepotName = $(edDepot.target).combobox('getText');
+				$('#materialData').datagrid('getRows')[editIndex]['DepotName'] = DepotName;
+			}
 			//商品信息
 	    	var edMaterial = $('#materialData').datagrid('getEditor', {index:editIndex,field:'MaterialExtendId'});
-			var MaterialName = $(edMaterial.target).next().find('input.textbox-text').val();
-	        $('#materialData').datagrid('getRows')[editIndex]['MaterialName'] = MaterialName;
+			if(edMaterial) {
+				var MaterialName = $(edMaterial.target).next().find('input.textbox-text').val();
+				$('#materialData').datagrid('getRows')[editIndex]['MaterialName'] = MaterialName;
+			}
 	        //其它信息
 	        $('#materialData').datagrid('endEdit', editIndex);
 	        editIndex = undefined;
diff --git a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
index 239c023c..b65e9c55 100644
--- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
+++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
@@ -367,7 +367,7 @@ public class DepotItemService {
                     depotItem.setMaterialId(materialId);
                     depotItem.setMaterialExtendId(tempInsertedJson.getLong("MaterialExtendId"));
                     depotItem.setMaterialUnit(tempInsertedJson.getString("Unit"));
-                    if (!StringUtil.isEmpty(tempInsertedJson.get("OperNumber").toString())) {
+                    if (StringUtil.isExist(tempInsertedJson.get("OperNumber"))) {
                         depotItem.setOperNumber(tempInsertedJson.getBigDecimal("OperNumber"));
                         try {
                             String Unit = tempInsertedJson.get("Unit").toString();
@@ -392,13 +392,13 @@ public class DepotItemService {
                             logger.error(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
                         }
                     }
-                    if (!StringUtil.isEmpty(tempInsertedJson.get("UnitPrice").toString())) {
+                    if (StringUtil.isExist(tempInsertedJson.get("UnitPrice"))) {
                         depotItem.setUnitPrice(tempInsertedJson.getBigDecimal("UnitPrice"));
                     }
-                    if (!StringUtil.isEmpty(tempInsertedJson.get("TaxUnitPrice").toString())) {
+                    if (StringUtil.isExist(tempInsertedJson.get("TaxUnitPrice"))) {
                         depotItem.setTaxUnitPrice(tempInsertedJson.getBigDecimal("TaxUnitPrice"));
                     }
-                    if (!StringUtil.isEmpty(tempInsertedJson.get("AllPrice").toString())) {
+                    if (StringUtil.isExist(tempInsertedJson.get("AllPrice"))) {
                         depotItem.setAllPrice(tempInsertedJson.getBigDecimal("AllPrice"));
                     }
                     depotItem.setRemark(tempInsertedJson.getString("Remark"));
@@ -408,13 +408,13 @@ public class DepotItemService {
                     if (tempInsertedJson.get("AnotherDepotId") != null && !StringUtil.isEmpty(tempInsertedJson.get("AnotherDepotId").toString())) {
                         depotItem.setAnotherDepotId(tempInsertedJson.getLong("AnotherDepotId"));
                     }
-                    if (!StringUtil.isEmpty(tempInsertedJson.get("TaxRate").toString())) {
+                    if (StringUtil.isExist(tempInsertedJson.get("TaxRate"))) {
                         depotItem.setTaxRate(tempInsertedJson.getBigDecimal("TaxRate"));
                     }
-                    if (!StringUtil.isEmpty(tempInsertedJson.get("TaxMoney").toString())) {
+                    if (StringUtil.isExist(tempInsertedJson.get("TaxMoney"))) {
                         depotItem.setTaxMoney(tempInsertedJson.getBigDecimal("TaxMoney"));
                     }
-                    if (!StringUtil.isEmpty(tempInsertedJson.get("TaxLastMoney").toString())) {
+                    if (StringUtil.isExist(tempInsertedJson.get("TaxLastMoney"))) {
                         depotItem.setTaxLastMoney(tempInsertedJson.getBigDecimal("TaxLastMoney"));
                     }
                     if (tempInsertedJson.get("OtherField1") != null) {