From 247fe119c4deeb647d52f1f85275bd71e993deed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 13 Oct 2020 01:17:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=92=8C=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/js/pages/bill/in_out.js | 10 +--------- .../com/jsh/erp/controller/DepotHeadController.java | 8 ++------ .../jsh/erp/service/depotHead/DepotHeadService.java | 12 ++++-------- .../jsh/erp/service/depotItem/DepotItemService.java | 3 +-- 4 files changed, 8 insertions(+), 25 deletions(-) diff --git a/erp_web/js/pages/bill/in_out.js b/erp_web/js/pages/bill/in_out.js index 37e16ebe..beb1c9d5 100644 --- a/erp_web/js/pages/bill/in_out.js +++ b/erp_web/js/pages/bill/in_out.js @@ -1353,8 +1353,6 @@ } this.endAllEdit(); var inserted = $("#materialData").datagrid('getRows'); - var deleted = []; - var updated = []; $.ajax({ type:"post", url: url, @@ -1363,9 +1361,7 @@ async : false, data: JSON.stringify({ info:infoStr, - inserted: JSON.stringify(inserted), - deleted: JSON.stringify(deleted), - updated: JSON.stringify(updated) + inserted: JSON.stringify(inserted) }), success: function (tipInfo){ if(tipInfo){ @@ -1396,8 +1392,6 @@ var self = this; this.endAllEdit(); var inserted = $("#materialData").datagrid('getRows'); - var deleted = []; - var updated = []; $.ajax({ type:"post", url: url, @@ -1408,8 +1402,6 @@ id:url.substring(url.lastIndexOf("?id=")+4,url.length), info:infoStr, inserted: JSON.stringify(inserted), - deleted: JSON.stringify(deleted), - updated: JSON.stringify(updated), preTotalPrice:preTotalPrice }), success: function (tipInfo){ diff --git a/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/src/main/java/com/jsh/erp/controller/DepotHeadController.java index ce31fa93..678e9fd4 100644 --- a/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -342,8 +342,6 @@ public class DepotHeadController { JSONObject result = ExceptionConstants.standardSuccess(); String beanJson = body.getInfo(); String inserted = body.getInserted(); - String deleted = body.getDeleted(); - String updated = body.getUpdated(); Long billsNumLimit = Long.parseLong(request.getSession().getAttribute("billsNumLimit").toString()); Long tenantId = Long.parseLong(request.getSession().getAttribute("tenantId").toString()); Long count = depotHeadService.countDepotHead(null,null,null,null,null,null,null,null); @@ -351,7 +349,7 @@ public class DepotHeadController { throw new BusinessParamCheckingException(ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_CODE, ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_MSG); } else { - depotHeadService.addDepotHeadAndDetail(beanJson,inserted,deleted,updated,tenantId, request); + depotHeadService.addDepotHeadAndDetail(beanJson,inserted,tenantId, request); } return result; } @@ -370,10 +368,8 @@ public class DepotHeadController { Long id = body.getId(); String beanJson = body.getInfo(); String inserted = body.getInserted(); - String deleted = body.getDeleted(); - String updated = body.getUpdated(); BigDecimal preTotalPrice = body.getPreTotalPrice(); - depotHeadService.updateDepotHeadAndDetail(id,beanJson,inserted,deleted,updated,preTotalPrice,tenantId,request); + depotHeadService.updateDepotHeadAndDetail(id,beanJson,inserted,preTotalPrice,tenantId,request); return result; } 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 25874b98..51c1574e 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -470,14 +470,12 @@ public class DepotHeadService { * 新增单据主表及单据子表信息 * @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, + public void addDepotHeadAndDetail(String beanJson, String inserted, Long tenantId, HttpServletRequest request) throws Exception { /**处理单据主表数据*/ DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class); @@ -504,7 +502,7 @@ public class DepotHeadService { if(list!=null) { Long headId = list.get(0).getId(); /**入库和出库处理单据子表信息*/ - depotItemService.saveDetials(inserted,deleted,updated,headId,tenantId, request); + depotItemService.saveDetials(inserted,headId,tenantId, request); } /**如果关联单据号非空则更新订单的状态为2 */ if(depotHead.getLinkNumber()!=null) { @@ -528,15 +526,13 @@ public class DepotHeadService { * @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, + public void updateDepotHeadAndDetail(Long id, String beanJson, String inserted, BigDecimal preTotalPrice, Long tenantId,HttpServletRequest request)throws Exception { /**更新单据主表信息*/ DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class); @@ -554,7 +550,7 @@ public class DepotHeadService { } } /**入库和出库处理单据子表信息*/ - depotItemService.saveDetials(inserted,deleted,updated,depotHead.getId(),tenantId,request); + depotItemService.saveDetials(inserted,depotHead.getId(),tenantId,request); logService.insertLog("单据", new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(depotHead.getNumber()).toString(), ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); 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 70e1e1e4..59198387 100644 --- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -296,7 +296,7 @@ public class DepotItemService { } @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public String saveDetials(String inserted, String deleted, String updated, Long headerId, Long tenantId, HttpServletRequest request) throws Exception{ + public String saveDetials(String inserted, Long headerId, Long tenantId, HttpServletRequest request) throws Exception{ //查询单据主表信息 DepotHead depotHead=null; try{ @@ -308,7 +308,6 @@ public class DepotItemService { User userInfo=userService.getCurrentUser(); //转为json JSONArray insertedJson = JSONArray.parseArray(inserted); - JSONArray deletedJson = JSONArray.parseArray(deleted); //删除单据的明细 deleteDepotItemHeadId(headerId);