From 9760cad7587dbd2474a8dd219d92c1f85fee9a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 9 Jan 2019 00:05:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=9A=E8=B4=A6=E6=88=B7=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=88=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/materials/in_out.js                      | 8 ++++----
 .../com/jsh/erp/service/depotHead/DepotHeadService.java   | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index d4305fda..0f6582c8 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -1727,7 +1727,9 @@
 	    $("#OperTimeShow").text(depotHeadInfo[4]);
 	    $('#OrganIdShow').text(depotHeadInfo[11]);
 	    $("#HandsPersonIdShow").text(depotHeadInfo[12]);
-	    if(depotHeadInfo[22]!="undefined" && depotHeadInfo[23]!="undefined"){
+        if(depotHeadInfo[13] && depotHeadInfo[13]!="undefined"){
+            $("#AccountIdShow").text(depotHeadInfo[13]); //结算账户
+        } else {
 			var accountArr = depotHeadInfo[22].split(","); //账户id列表
 			var accountMoneyArr = depotHeadInfo[23].split(","); //账户金额列表
 			var accountIdShow = "";
@@ -1747,9 +1749,7 @@
 				}
 			}
 			$("#AccountIdShow").text(accountIdShow);
-		} else if(depotHeadInfo[13]){
-            $("#AccountIdShow").text(depotHeadInfo[13]); //结算账户
-        }
+		}
 	    $("#ChangeAmountShow").text(depotHeadInfo[8]);
 	    $("#RemarkShow").text(depotHeadInfo[9]);
 		$("#DiscountShow").text(depotHeadInfo[19]);
diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index d4c7f96f..e3fc753c 100644
--- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -82,13 +82,17 @@ public class DepotHeadService {
         }
         depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
         depotHead.setStatus(false);
-        return depotHeadMapper.insertSelective(depotHead);
+        return depotHeadMapper.insert(depotHead);
     }
 
     public int updateDepotHead(String beanJson, Long id) {
+        DepotHead dh = depotHeadMapper.selectByPrimaryKey(id);
         DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class);
         depotHead.setId(id);
-        return depotHeadMapper.updateByPrimaryKeySelective(depotHead);
+        depotHead.setStatus(dh.getStatus());
+        depotHead.setCreatetime(dh.getCreatetime());
+        depotHead.setOperpersonname(dh.getOperpersonname());
+        return depotHeadMapper.updateByPrimaryKey(depotHead);
     }
 
     public int deleteDepotHead(Long id) {