Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-08-11 e51e45f2cabcc4628ce93e55c7c3806b1b760161

 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java

@@ -1000,6 +1000,8 @@
                }
                materialInventoryMapper.updateMaterialInventoryAvailableInventoryOutMes(Long.valueOf(optimizeUses.getRawStockCode()),quantity);
                materialInventoryMapper.updateOptimizeUsesMes(optimizeUses.getId(),quantity);
            }else{
                return false;
            }

            //保存日志
@@ -1108,7 +1110,7 @@

    public Map<String, Object> mesOriginalSelect() {
        Map<String, Object> map = new HashMap<>();
        map.put("data", materialInventoryMapper.getSelectMaterialInventoryMes());
        map.put("originalList", materialInventoryMapper.getSelectMaterialInventoryMes());
        return map;
    }

@@ -1242,4 +1244,39 @@

    }


    public String updateMaterialInventory(Map<String,Object> object) {
        String saveState = "true";
        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {

            long materialInventoryId = 0L;
            if (object.get("materialInventoryId") != null) {
                materialInventoryId = Long.parseLong(object.get("materialInventoryId").toString());
            }
            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setContent(object.toString());
            log.setFunction("updateMaterialInventory物料库存修改");
            MaterialInventory materialInventory = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), MaterialInventory.class);

            materialInventoryMapper.updateMaterialInventoryAll(materialInventoryId,materialInventory);

            logService.saveLog(log);
        } 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;

    }

}