From a1e60e5eda7989c8ba02a70e374c004b6b2e5232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 18 Jan 2019 23:16:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8D=95=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=88=B0=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/materials/bill_detail.js              |  2 +-
 erp_web/js/pages/materials/in_out.js                   |  4 ++--
 .../com/jsh/erp/datasource/vo/DepotHeadVo4List.java    | 10 ++++++++++
 .../jsh/erp/service/depotHead/DepotHeadService.java    |  4 ++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/erp_web/js/pages/materials/bill_detail.js b/erp_web/js/pages/materials/bill_detail.js
index 788eab4a..961bbb66 100644
--- a/erp_web/js/pages/materials/bill_detail.js
+++ b/erp_web/js/pages/materials/bill_detail.js
@@ -216,7 +216,7 @@
                             $("#bill .AccountIdShow").text(accountIdShow);
                         }
                         $("#bill .OrganIdShow").text(data.organName);
-                        $("#bill .OperTimeShow").text(data.opertime);
+                        $("#bill .OperTimeShow").text(data.opertimeStr);
                         $("#bill .NumberShow").text(data.number);
                         $("#bill .RemarkShow").text(data.remark);
                         $("#bill .DiscountShow").text(data.discount);
diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index 8bc125d1..6beec94d 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -563,7 +563,7 @@
 					formatter:function(value,rec) {
 						var str = '';
 						var rowInfo = rec.id + 'AaBb' + rec.projectid+ 'AaBb' + rec.number+ 'AaBb' + rec.operpersonname
-							+ 'AaBb' + rec.opertime+ 'AaBb' + rec.organid+ 'AaBb' + rec.handspersonid
+							+ 'AaBb' + rec.opertimeStr+ 'AaBb' + rec.organid+ 'AaBb' + rec.handspersonid
 							+ 'AaBb' + rec.accountid+ 'AaBb' + rec.changeamount+ 'AaBb' + rec.remark
 							+ 'AaBb' + rec.projectName+ 'AaBb' + rec.organName+ 'AaBb' + rec.handsPersonName
 							+ 'AaBb' + rec.accountName + 'AaBb' + rec.totalprice + 'AaBb' + rec.allocationprojectid
@@ -588,7 +588,7 @@
 						}
 					}
 				},
-				{ title: '单据日期 ',field: 'opertime',width:130},
+				{ title: '单据日期',field: 'opertimeStr',width:130},
 				{ title: '操作员',field: 'operpersonname',width:60},
 				{ title: '金额合计',field: 'totalprice',width:60},
 				{ title: '含税合计',field: 'totaltaxlastmoney',hidden:isShowLastMoneyColumn,width:60,formatter:function(value,rec){
diff --git a/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java b/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
index 6e9d159c..ed1b2131 100644
--- a/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
+++ b/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
@@ -73,6 +73,8 @@ public class DepotHeadVo4List {
 
     private String materialsList;
 
+    private String opertimeStr;
+
     public Long getId() {
         return id;
     }
@@ -344,4 +346,12 @@ public class DepotHeadVo4List {
     public void setMaterialsList(String materialsList) {
         this.materialsList = materialsList;
     }
+
+    public String getOpertimeStr() {
+        return opertimeStr;
+    }
+
+    public void setOpertimeStr(String opertimeStr) {
+        this.opertimeStr = opertimeStr;
+    }
 }
\ No newline at end of file
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 62c63ccc..2c951165 100644
--- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -25,6 +25,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import static com.jsh.erp.utils.Tools.getCenternTime;
+
 @Service
 public class DepotHeadService {
     private Logger logger = LoggerFactory.getLogger(DepotHeadService.class);
@@ -60,6 +62,7 @@ public class DepotHeadService {
                 if(dh.getTotalprice() != null) {
                     dh.setTotalprice(dh.getTotalprice().abs());
                 }
+                dh.setOpertimeStr(getCenternTime(dh.getOpertime()));
                 dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
                 resList.add(dh);
             }
@@ -243,6 +246,7 @@ public class DepotHeadService {
                 if(dh.getTotalprice() != null) {
                     dh.setTotalprice(dh.getTotalprice().abs());
                 }
+                dh.setOpertimeStr(getCenternTime(dh.getOpertime()));
                 dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
                 resList.add(dh);
             }