north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -142,7 +142,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("addSelectWarehousing"); sysErrorService.insert(sysError); saveState = false; @@ -234,7 +234,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("addDeliveryDetail"); sysErrorService.insert(sysError); saveState = false; @@ -304,7 +304,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("updateFinishedGoodsInventoryAllocate"); sysErrorService.insert(sysError); saveState = false; @@ -387,7 +387,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("updateFinishedGoodsInventoryTakeOut"); sysErrorService.insert(sysError); saveState = false; @@ -470,7 +470,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("updateFinishedGoodsInventoryRework"); sysErrorService.insert(sysError); saveState = false; @@ -517,7 +517,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("updateFinishedGoodsInventoryToExamine"); sysErrorService.insert(sysError); saveState = false; @@ -554,7 +554,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("cancelFinishedGoodsInventoryToExamine"); sysErrorService.insert(sysError); saveState = false; @@ -680,7 +680,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("cancelFinishedGoodsInventoryStorage"); sysErrorService.insert(sysError); saveState = false; @@ -722,7 +722,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("oneClickStorage"); sysErrorService.insert(sysError); saveState = false; north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
@@ -108,8 +108,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("saveMaterialOutbound"); sysErrorService.insert(sysError); saveState = false; @@ -120,28 +120,41 @@ public Boolean saveMaterialInventory(Map<String,Object> object) { boolean saveState = true; Double singlePieceArea = 0.0; Double totalArea = 0.0; Long materialCode = 0L; if (object.get("singlePieceArea") != null) { singlePieceArea = Double.valueOf(object.get("singlePieceArea").toString()); } if (object.get("totalArea") != null) { totalArea = Double.valueOf(object.get("totalArea").toString()); } if (object.get("materialCode") != null) { materialCode = Long.valueOf(object.get("materialCode").toString()); } //设置回滚点 Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint(); try { Double singlePieceArea = 0.0; Double totalArea = 0.0; Long materialCode = 0L; if (object.get("singlePieceArea") != null) { singlePieceArea = Double.valueOf(object.get("singlePieceArea").toString()); } if (object.get("totalArea") != null) { totalArea = Double.valueOf(object.get("totalArea").toString()); } if (object.get("materialCode") != null) { materialCode = Long.valueOf(object.get("materialCode").toString()); } MaterialInventory materialInventory = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), MaterialInventory.class); MaterialInventory materialInventory = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), MaterialInventory.class); //查询物料是否存在 Integer MaterialInventoryCount = materialInventoryMapper.getMaterialInventoryCount(materialCode,materialInventory.getDateOfManufacture()); //查询物料是否存在 Integer MaterialInventoryCount = materialInventoryMapper.getMaterialInventoryCount(materialCode,materialInventory.getDateOfManufacture()); if(MaterialInventoryCount>0){ materialInventoryMapper.updateMaterialInventory(materialCode,singlePieceArea,totalArea,materialInventory); }else { materialInventoryMapper.insertMaterialInventory(materialCode,singlePieceArea,totalArea,materialInventory); if(MaterialInventoryCount>0){ materialInventoryMapper.updateMaterialInventory(materialCode,singlePieceArea,totalArea,materialInventory); }else { materialInventoryMapper.insertMaterialInventory(materialCode,singlePieceArea,totalArea,materialInventory); } } catch (Exception e) { TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("saveMaterialInventory"); sysErrorService.insert(sysError); saveState = false; } return saveState; @@ -238,8 +251,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("deleteMaterialOutbound"); sysErrorService.insert(sysError); saveState = false; @@ -338,8 +351,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("updateMaterialOutboundToExamine"); sysErrorService.insert(sysError); saveState = false; @@ -354,11 +367,12 @@ boolean saveState = true; //设置回滚点 Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint(); String returningId = ""; String oddNumber; if (object.get("returningId") != null) { returningId = object.get("returningId").toString(); } try { String returningId = ""; String oddNumber; if (object.get("returningId") != null) { returningId = object.get("returningId").toString(); } ReturningWarehouse returningWarehouse = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), ReturningWarehouse.class); List<ReturningWarehouseDetail> returningWarehouseDetailList = JSONArray.parseArray(JSONObject.toJSONString(object.get("returningWarehouseDetail")), ReturningWarehouseDetail.class); //查询出库单是否存在 @@ -440,7 +454,16 @@ } } catch (Exception e) { TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("saveReturningWarehouse"); sysErrorService.insert(sysError); saveState = false; } return saveState; } @@ -499,8 +522,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("updateReturningWarehouseToExamine"); sysErrorService.insert(sysError); saveState = false;
@@ -30,6 +30,9 @@ public Boolean saveMaterialStore(Map<String,Object> object) { boolean saveState = true; //设置回滚点 Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint(); try { String id = ""; String type = ""; String json = ""; @@ -61,7 +64,16 @@ }else{ materialStoreMapper.insertMaterialStore(type,json); } } catch (Exception e) { TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("saveMaterialStore"); sysErrorService.insert(sysError); saveState = false; } return saveState; } @@ -94,8 +106,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("deleteMaterialStore"); sysErrorService.insert(sysError); saveState = false;
@@ -46,21 +46,21 @@ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint(); try { Customer customer = JSONObject.parseObject(JSONObject.toJSONString(object.get("customer")), Customer.class); if(customer!=null){ customer=null; if (customer.getId()!=null && customer.getId()!=0){ customerMapper.updateCustomer(customer); }else{ customerMapper.insertCustomer(customer); } } } catch (Exception e) { TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("insertCustomer"); sysErrorService.insert(sysError); saveState = false; @@ -88,8 +88,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("deleteCustomer"); sysErrorService.insert(sysError); saveState = false;
@@ -325,8 +325,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("insertDelivery"); sysErrorService.insert(sysError); saveState = false; @@ -383,8 +383,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("deleteDelivery"); sysErrorService.insert(sysError); saveState = false;
