From 5f0cdd3f2e663806c10e297219184692e0647c63 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, 21 Mar 2020 17:38:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91=EF=BC=9A?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=BF=AE=E6=94=B9=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=97=A5=E6=9C=9F=E4=B8=8D=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/depotHead/DepotHeadService.java   | 53 +++++++++----------
 1 file changed, 25 insertions(+), 28 deletions(-)

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 070f825a..9b6e46d4 100644
--- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -458,13 +458,14 @@ public class DepotHeadService {
     }
 
     /**
-     *  新增单据主表及单据子表信息
-     * create time: 2019/1/25 14:36
-     * @Param: beanJson
-     * @Param: inserted
-     * @Param: deleted
-     * @Param: updated
-     * @return java.lang.String
+     * 新增单据主表及单据子表信息
+     * @param beanJson
+     * @param inserted
+     * @param deleted
+     * @param updated
+     * @param tenantId
+     * @param request
+     * @throws Exception
      */
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public void addDepotHeadAndDetail(String beanJson, String inserted, String deleted, String updated,Long tenantId,
@@ -513,16 +514,18 @@ public class DepotHeadService {
             }
         }
     }
+
     /**
      * 更新单据主表及单据子表信息
-     * create time: 2019/1/28 14:47
-     * @Param: id
-     * @Param: beanJson
-     * @Param: inserted
-     * @Param: deleted
-     * @Param: updated
-     * @Param: preTotalPrice
-     * @return java.lang.Object
+     * @param id
+     * @param beanJson
+     * @param inserted
+     * @param deleted
+     * @param updated
+     * @param preTotalPrice
+     * @param tenantId
+     * @param request
+     * @throws Exception
      */
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public void updateDepotHeadAndDetail(Long id, String beanJson, String inserted, String deleted, String updated,
@@ -536,7 +539,6 @@ public class DepotHeadService {
         depotHead.setId(id);
         User userInfo=userService.getCurrentUser();
         depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername());
-        depotHead.setOpertime(new Timestamp(System.currentTimeMillis()));
         try{
             depotHeadMapper.updateByPrimaryKeySelective(depotHead);
         }catch(Exception e){
@@ -553,12 +555,9 @@ public class DepotHeadService {
     }
 
     /**
-     * create by: cjl
-     * description:
-     *  删除单据主表及子表信息
-     * create time: 2019/1/28 17:29
-     * @Param: id
-     * @return java.lang.Object
+     * 删除单据主表及子表信息
+     * @param id
+     * @throws Exception
      */
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public void deleteDepotHeadAndDetail(Long id) throws Exception {
@@ -597,13 +596,11 @@ public class DepotHeadService {
         /**删除单据主表信息*/
         batchDeleteDepotHeadByIds(id.toString());
     }
+
     /**
-     * create by: cjl
-     * description:
-     *  批量删除单据主表及子表信息
-     * create time: 2019/1/28 17:29
-     * @Param: id
-     * @return java.lang.Object
+     * 批量删除单据主表及子表信息
+     * @param ids
+     * @throws Exception
      */
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public void batchDeleteDepotHeadAndDetail(String ids) throws Exception{